From nobody Mon Jan 22 00:06:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJ9WJ4jccz5833X; Mon, 22 Jan 2024 00:06: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 4TJ9WJ4CPQz4ZLk; Mon, 22 Jan 2024 00:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705882012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQnGU64uh+sRg+DfP8o3mfsKD0EeOIWLFNDvHh9xSLg=; b=IILGkDpS42WJ1NnaUXQzC8DMaOyprve+o9VhqsLjTNQi2X9urDadLCMPkosoKnW5NLs2b0 hHlyQeabRtHjMsHyzQ4ZBQPEayj+3FyQiKJ1Nqrtj8mDx9uv32D7/bUnHRxgAVTkBvjIoI H5EUFjuRSKZiZ/bBoSUUsYWBQgwHxd0XHMblpIbgWquP7t/mswTli4gE4lT4Bq7tTSoYz0 Xd8+Jc68RSelfstNm5HM39X/ZD7WDIBK4KwTM/c6SKxvl1ovxKnGthgtqhj2kvSr3QdkNH 0ILzcAiAtaixHddbhh9ZqJ4oFTZcAUr2yuC1Z2xR2e03f+klglhmu3UtNyiAOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705882012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQnGU64uh+sRg+DfP8o3mfsKD0EeOIWLFNDvHh9xSLg=; b=ykXeZ12+xURVwZ6t/HDt64qerhnosVxJfYEP6o4kCT09+yMPrd8ioEvnzM8CxVNAGOS3KR e5Dg/dLJ2uFceoPo3zokyc5fPUIrK3Up2QIU5+xu52JopZLUelylnSLW8awpfFBNuT6HZd aZU4aKXR6MZmID6ChEjtEvNvMXipyMyJ22EqXhlWzMNVeR5o+tZgUyaFQBxznGOecxO+JU RtITq0T+pfv+zPAfrIZ31YXPZ8MZO25fIwF5SKKNEI+j2MKUNpg+3ue79+jEfoYPo0UtTO 3fSlgNnyC/uS6DjgCHBwRhXjWb5WXH//iNf6nYicSD9HdRa66GakzpCINnMK2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705882012; a=rsa-sha256; cv=none; b=BoEw3YQKbHTztLDWQ9om1fRUBnN+a64u8YiQ8amiP5O42WZNWCNe+jpNgo40mxP5E/PYO2 UwrHouzfNFYMTzB1IC48S7mmezj9NJy84ieN04qpQCaui9NgGm5oX2QaTxzu2fMXPmZquy rvWGyADhtE+UTrlgHOuR0LveNNRVOaX0Ae9st+ThReC8L98X8NanoBgkbyhuw6Azrsrz31 qUArdjtmsuWH9qkAye2+wEaZtxkLAYd9Pih6kXvjn0sdLI5sfOiRIun6WD/2xQVtoo5JBs 6G+rbePaleDhDDGkycU0NOKzHD245EDE0lTwpjKC3vFeJH+sbrZH9K+9lc/+Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJ9WJ3Ggxzg70; Mon, 22 Jan 2024 00:06: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 40M06qlG049886; Mon, 22 Jan 2024 00:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M06qxU049881; Mon, 22 Jan 2024 00:06:52 GMT (envelope-from git) Date: Mon, 22 Jan 2024 00:06:52 GMT Message-Id: <202401220006.40M06qxU049881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 91f78c32befa - main - rc.d/kdc: Support start of MIT krb5kdc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91f78c32befa08bf4010db7afd4407277a3e585f Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=91f78c32befa08bf4010db7afd4407277a3e585f commit 91f78c32befa08bf4010db7afd4407277a3e585f Author: Cy Schubert AuthorDate: 2024-01-20 13:52:35 +0000 Commit: Cy Schubert CommitDate: 2024-01-22 00:06:26 +0000 rc.d/kdc: Support start of MIT krb5kdc Some users wishing to use the MIT krb5kdc have discovered the kdc script workaround applied to the MIT krb5 ports is insufficient. Let's build into this rc script the smarts to determine whether base or ports Hiemdal kdc is being invoked or the MIT krb5kdc. While at it, remove kdc_start_precmd(). This will simplify a future jail patch. Suggested by: netchild Original patch: netchild Reviewed by: emaste, netchild MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43523 --- libexec/rc/rc.d/kdc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libexec/rc/rc.d/kdc b/libexec/rc/rc.d/kdc index 4b8cf87197e8..c3059f261e09 100755 --- a/libexec/rc/rc.d/kdc +++ b/libexec/rc/rc.d/kdc @@ -12,17 +12,15 @@ name=kdc desc="Kerberos 5 server" rcvar=${name}_enable -start_precmd=${name}_start_precmd set_rcvar_obsolete kerberos5_server_enable kdc_enable set_rcvar_obsolete kerberos5_server kdc_program set_rcvar_obsolete kerberos5_server_flags kdc_flags -kdc_start_precmd() -{ - - command_args="$command_args --detach" -} load_rc_config $name +if [ "${kdc_program}" = /usr/libexec/kdc -o \ + "${kdc_program}" = /usr/local/libexec/kdc ]; then + command_args="$command_args --detach" +fi run_rc_command "$1" From nobody Mon Jan 22 01:35:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJCTt6wfxz58BRd; Mon, 22 Jan 2024 01:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJCTt6Jqyz4mjq; Mon, 22 Jan 2024 01:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705887346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ijPdEU5hQVeAz1v6p46RPQFdtCuoWmJc56bQ5KwGSbU=; b=R7vmYoO0yXHLqu6lNcSANEgTEH6kbZJaXzjvZig0BbQZAel2VYfv2zoXxPXHbkMQHeANnR Aq6kevf6trj4e1oWGqNhGthuzS28dcdlJjGzelzyHpzZkBMIFA7PBgX9R3myudAbb0oQv/ Q7NJRUJaaJpvawxD/qDs57gc4iI+0dE3w4VotPM+h9N4p4cETOxFIHrfPklXeNNjJb9o0Z 4nf1xiBNWrGx5voRYCdFWBoKMAgd8l+kG5EC3RnIcWHXr4rmYDpX4qcZ6XGiyLyX0pSB8o gsn8HvZtOFXpC2Y5tT8GGosQWItnjRw8j+Xt0BgRDo5DfCRQzfzPsqCAckQvYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705887346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ijPdEU5hQVeAz1v6p46RPQFdtCuoWmJc56bQ5KwGSbU=; b=WXaa+geO+1bigNy73M/u0uv77OCwDMQdbJ50uSMKlnQUW8Z0XjpZpl1gdV8wKx7ATzXRta avlNHv1KyukuGnLRKe6WntUc4MIa/9CpJ2/9l0EjkPDgx4Fe1p23bfI3DRcAGxDWplKYkg e6rVJNXi/mH92dB/7FYrRQ3CeeQL6T8JGa776m3RYR9lF9PEIuJU0KSQWD2wHxybccjwTp LLTpIvhKdOLTMerwBBVnI+FcvenThoXEdYRYm3cp9RpZ7KniuAlvL/Sncn9QXoShZs3o1A QxqcY5j3IqRepPI/D1NpS7hOishT83E+zMjU6ONteiCE0WTY8d5TR5MrX/Se+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705887346; a=rsa-sha256; cv=none; b=dxlIshMdJ4f7RuLw8fkd2DzUAXjAa/9cDXQY0P/23z3u2UmetXSShyZrOq2nx6lOrXjrtL JyuO/SkxJ/ABDYBpR8Vqhdrikr3WxHw2vOEck4IKauJ56UtxqP6GtgucDCuojQ7YUWNCdB ktkbK6Gry/vTdU12Q8PHQNyS5wAqv0Ibc21DQ8mw5J9PVGQb//LgLTnUoAmuU5N9qT68KS iQlr2mkf36zMKqEnvS5nm0ZYXbQJXOgJt/P1EePuQq8XHO2kuXC9esp6eFpS5ji5mBbl0O DIuSwz322MIiJ5O+Gb5yLFzHHVhjggC71sQ2w+yOWB3Y+JZBoh02MhZFA/1hQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJCTt5KTfzhvy; Mon, 22 Jan 2024 01:35:46 +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 40M1ZkNv002993; Mon, 22 Jan 2024 01:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M1ZkpM002990; Mon, 22 Jan 2024 01:35:46 GMT (envelope-from git) Date: Mon, 22 Jan 2024 01:35:46 GMT Message-Id: <202401220135.40M1ZkpM002990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e4b646ce1610 - main - find: Add -readable, -writable & -executable options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4b646ce16105efc943bc8ac2242a2220dfe18d8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e4b646ce16105efc943bc8ac2242a2220dfe18d8 commit e4b646ce16105efc943bc8ac2242a2220dfe18d8 Author: Ricardo Branco AuthorDate: 2024-01-21 19:53:05 +0000 Commit: John Baldwin CommitDate: 2024-01-22 01:33:46 +0000 find: Add -readable, -writable & -executable options Reviewed by: jhb, Mina Galić Pull Request: https://github.com/freebsd/freebsd-src/pull/1080 --- usr.bin/find/extern.h | 3 +++ usr.bin/find/find.1 | 20 +++++++++++++++++++- usr.bin/find/function.c | 39 +++++++++++++++++++++++++++++++++++++++ usr.bin/find/option.c | 3 +++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h index a1bd5e6d16a5..feb2e0202056 100644 --- a/usr.bin/find/extern.h +++ b/usr.bin/find/extern.h @@ -86,6 +86,7 @@ exec_f f_delete; exec_f f_depth; exec_f f_empty; exec_f f_exec; +exec_f f_executable; exec_f f_expr; exec_f f_false; exec_f f_flags; @@ -107,11 +108,13 @@ exec_f f_print; exec_f f_print0; exec_f f_prune; exec_f f_quit; +exec_f f_readable; exec_f f_regex; exec_f f_size; exec_f f_sparse; exec_f f_type; exec_f f_user; +exec_f f_writable; extern int ftsoptions, ignore_readdir_race, isdepth, isoutput; extern int issort, isxargs; diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1 index 856961d02395..635d42656bad 100644 --- a/usr.bin/find/find.1 +++ b/usr.bin/find/find.1 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 15, 2024 +.Dd January 21, 2024 .Dt FIND 1 .Os .Sh NAME @@ -465,6 +465,12 @@ if at least one invocation of returns a non-zero exit status, .Nm will return a non-zero exit status. +.It Ic -executable +Matches files which are executable by the current user. +This test makes use of the +.Xr access 2 +system call, and so can be fooled by NFS servers which do UID mapping (or root-squashing). +This is a GNU find extension. .It Ic -flags Oo Cm - Ns | Ns Cm + Oc Ns Ar flags , Ns Ar notflags The flags are specified using symbolic names (see .Xr chflags 1 ) . @@ -829,6 +835,12 @@ option was specified. Causes .Nm to terminate immediately. +.It Ic -readable +Matches files which are readable by the current user. +This test makes use of the +.Xr access 2 +system call, and so can be fooled by NFS servers which do UID mapping (or root-squashing). +This is a GNU find extension. .It Ic -regex Ar pattern True if the whole path of the file matches .Ar pattern @@ -925,6 +937,12 @@ is treated as a user ID. The same thing as .Ic -path , for GNU find compatibility. +.It Ic -writable +Matches files which are writable by the current user. +This test makes use of the +.Xr access 2 +system call, and so can be fooled by NFS servers which do UID mapping (or root-squashing). +This is a GNU find extension. .El .Sh OPERATORS The primaries may be combined using the following operators. diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c index f96a086cbda3..ef610903cc00 100644 --- a/usr.bin/find/function.c +++ b/usr.bin/find/function.c @@ -1808,3 +1808,42 @@ f_quit(PLAN *plan __unused, FTSENT *entry __unused) } /* c_quit == c_simple */ + +/* + * -readable + * + * File is readable + */ +int +f_readable(PLAN *plan __unused, FTSENT *entry) +{ + return (access(entry->fts_path, R_OK) == 0); +} + +/* c_readable == c_simple */ + +/* + * -writable + * + * File is writable + */ +int +f_writable(PLAN *plan __unused, FTSENT *entry) +{ + return (access(entry->fts_path, W_OK) == 0); +} + +/* c_writable == c_simple */ + +/* + * -executable + * + * File is executable + */ +int +f_executable(PLAN *plan __unused, FTSENT *entry) +{ + return (access(entry->fts_path, X_OK) == 0); +} + +/* c_executable == c_simple */ diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index 166fc75e9c51..99c67eed8cd9 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -75,6 +75,7 @@ static OPTION const options[] = { { "-empty", c_empty, f_empty, 0 }, { "-exec", c_exec, f_exec, 0 }, { "-execdir", c_exec, f_exec, F_EXECDIR }, + { "-executable", c_simple, f_executable, 0 }, { "-false", c_simple, f_false, 0 }, #if HAVE_STRUCT_STAT_ST_FLAGS { "-flags", c_flags, f_flags, 0 }, @@ -149,6 +150,7 @@ static OPTION const options[] = { // -printf { "-prune", c_simple, f_prune, 0 }, { "-quit", c_simple, f_quit, 0 }, + { "-readable", c_simple, f_readable, 0 }, { "-regex", c_regex, f_regex, 0 }, { "-samefile", c_samefile, f_inum, 0 }, { "-size", c_size, f_size, 0 }, @@ -158,6 +160,7 @@ static OPTION const options[] = { { "-uid", c_user, f_user, 0 }, { "-user", c_user, f_user, 0 }, { "-wholename", c_name, f_path, 0 }, + { "-writable", c_simple, f_writable, 0 }, { "-xdev", c_xdev, f_always_true, 0 }, // -xtype }; From nobody Mon Jan 22 03:27:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJFzc1wRvz56stf for ; Mon, 22 Jan 2024 03:28:12 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJFzb49kHz4wZ9 for ; Mon, 22 Jan 2024 03:28:11 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-33931b38b65so769373f8f.3 for ; Sun, 21 Jan 2024 19:28:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705894089; x=1706498889; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j/uLPsxr4GzEw1Vi8D3zWjYgJoSPL4e5wO7F7f5ZidQ=; b=okbTfnOsr/C5OTt2jxCpFMRJ1c+pvo8O5vHnomFsSsSc5/dF1O9CcZRytLsPLCkMtw rqaUyt9FTZDPg/QczH/+XzmGPA+ooB00yFqEkdHbThty3LTNDdw9TXVtOrgGUoNHNHSY gDGIwCw2vywHCNiynHjqSCOQREVCgybL/IIhrXYRbpye0yfCA9n7khXMEOxRikw73k5Z 9E84aN5qBuUxanZTd4MrdeM6s+imNPc9TB9/bOHWfZ71jyFx+rKoqK7oRWMxWPc9cTou Ga/KipGwNaEjRt0/ki6zdx+DaczwfTWgl2M4ZdWqQa3KGkCnedGzuRmlgbqOlWiDMl8K S4xw== X-Gm-Message-State: AOJu0YxSb6EeiyM9muA/NhljFnxpDUfQhgLWDDNAE+GU+qBZBse+YUUZ UAhJkRJ23SNCGNBcFGgIxrtnVhoCyvKiwhkqG+EF5xNA34e15e0CTu8SIAppym4= X-Google-Smtp-Source: AGHT+IGm9ANKf7tYtQYkGLvRZheHPZM/452KCMktjPHPshqrpogVvg91nOryzmjwM3AVcjvba35hYA== X-Received: by 2002:a5d:4704:0:b0:337:aa99:5e9d with SMTP id y4-20020a5d4704000000b00337aa995e9dmr1064569wrq.164.1705894089260; Sun, 21 Jan 2024 19:28:09 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id e1-20020a5d65c1000000b0033921b2a5d4sm7464297wrw.75.2024.01.21.19.28.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Jan 2024 19:28:08 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 636592343c3e - main - tmpfs: increase memory reserve to a percent of available memory + swap From: Jessica Clarke In-Reply-To: <202312191534.3BJFY3fo030908@gitrepo.freebsd.org> Date: Mon, 22 Jan 2024 03:27:57 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202312191534.3BJFY3fo030908@gitrepo.freebsd.org> To: Mike Karels X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.40 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.47:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.47:from] X-Rspamd-Queue-Id: 4TJFzb49kHz4wZ9 On 19 Dec 2023, at 15:34, Mike Karels wrote: >=20 > The branch main has been updated by karels: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D636592343c3ec0feb61a4d8043676381= 384420dd >=20 > commit 636592343c3ec0feb61a4d8043676381384420dd > Author: Mike Karels > AuthorDate: 2023-12-19 15:33:33 +0000 > Commit: Mike Karels > CommitDate: 2023-12-19 15:33:33 +0000 >=20 > tmpfs: increase memory reserve to a percent of available memory + = swap >=20 > The tmpfs memory reserve defaulted to 4 MB, and other than that, > all of available memory + swap could be allocated to tmpfs files. > This was dangerous, as the page daemon attempts to keep some memory > free, using up swap, and then resulting in processes being killed. > Increase the reserve to a fraction of available memory + swap at > file system startup time. The limit is expressed as a percentage > of available memory + swap that can be used, and defaults to 95%. > The percentage can be changed via the vfs.tmpfs.memory_percent = sysctl, > recomputing the reserve with the new percentage but the initial > available memory + swap. Note that the reserve can also be set > directly with an existing sysctl, ignoring the percentage. The > previous behavior can be specified by setting = vfs.tmpfs.memory_percent > to 100. >=20 > Add sysctl for vfs.tmpfs.memory_percent and the pre-existing > vfs.tmpfs.memory_reserved to tmpfs(5). >=20 > PR: 275436 > MFC after: 1 month > Reviewed by: rgrimes > Differential Revision: https://reviews.freebsd.org/D43011 I just got: make[6]: Could not create temporary file /tmp/makeDl4i9S: No space = left on device after doing a buildworld -j4 on a 4 core, 16 GiB system where /tmp is a tmpfs, with the prior buildworld having taken me past this commit, which I strongly suspect to be the cause. Whilst I understand the motivation behind your commits, this is a sad regression to have; it=E2=80= =99s not exactly a particularly strange situation. The system is a HiFive Unmatched, for what it's worth. Jess From nobody Mon Jan 22 03:48:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJGQZ3tLvz56vCH; Mon, 22 Jan 2024 03:48:06 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJGQZ3Lyzz4xts; Mon, 22 Jan 2024 03:48:06 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705895286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=bqrzrLCRKnPj8Hv4+GKGikWgABNHNIjYEmfpKwT01pQ=; b=cqMNmFZw1ZV1HboCYTGQiBXympfmhFd2I7AwARkdaieBA+jf9uQSQD52yjZa3y4xB2btzy ntd8UYibjDtan0EQOhBnQ/hnYFsgZsLDrInHQuPV+AXuOTF8NhAM9Zp8oJUW39UURI4Fju ok1vIFVHa7gSk5XKMnCBMwmzaN5HbK4BIT3bBQZTxHiyF93N6IOXoMloUjwpFauhN7t3wq Q0fTEkjZjQaAXWlUJnMvQRSjo/qduGI2MKbvqBeHK2daPiWlqktTgoFWcjC8jpZCT1Idem 7aU/EkmKmz9VkPiQzncmgy7PRS6elulpAHD8j4oGgj5ZbbU80UsFqjMutYJnSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705895286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=bqrzrLCRKnPj8Hv4+GKGikWgABNHNIjYEmfpKwT01pQ=; b=lxYgZwhR51a2i4no8vuef+8x8FN2+iBJVXsiiXX5VLlqq0HdqWUbBpZpC5Slx4+OxnVAgm IPpb792aeU75CqaX6EfhXtaZZOPPWShuy0//LHXltXv+NGRYZElGrQwZ754vyK9jMvgTaT t0R83rpP7wEkTNrt9tBsuR+zHCyyVmvtPjRVOWg9bl6Av4TufF4rBY6CVmELxdlscAIXg6 m8oJAw6uVUPebNeI6tERhAljlLFncqFEMoq/12Xsl5vVlA4+o0FofL7Rs7iHRRySQSe36x irJGjOwfQxFNkDePJj/zLjuIrrp7/nSpRfsnJv7b5GEJ03WqEuZukdXJp92F0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705895286; a=rsa-sha256; cv=none; b=wmg7n0ovgaR2U31hzuRPA8RsdVR7Ho4dZ0g0QhbYBiUmvh0XGI7GqrrjzFt7GM36kuBfAs 41qiRaWj0RqHB88FqwULwJUidYdyIfT9tvXFfn9DOrpjFw/yOdzAXo618w9gElESqf1JCE vPJxFnl+/+p3OLgmaWM9+Njw0SE2WFBwf+zdh4BACd+5JE++K1x56ioM4v+yLJg1gWd2Jk yq8bZEZlZUPJvnzIV6nL7rVmlIbxOF+8U+5blL3ciWZil041wlcxRAeBkapDKjAM9snEtA UOWJQVewJlW6Q5+yge9CicWY5aw+DuXxqsiE7Xk7PjUGrbYyqxvRttXShsk6xQ== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 4D05A19B86; Mon, 22 Jan 2024 03:48:06 +0000 (UTC) Date: Mon, 22 Jan 2024 03:48:06 +0000 From: Alexey Dokuchaev To: Jessica Clarke Cc: Mike Karels , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 636592343c3e - main - tmpfs: increase memory reserve to a percent of available memory + swap Message-ID: References: <202312191534.3BJFY3fo030908@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Mon, Jan 22, 2024 at 03:27:57AM +0000, Jessica Clarke wrote: > On 19 Dec 2023, at 15:34, Mike Karels wrote: > > commit 636592343c3ec0feb61a4d8043676381384420dd > > > > tmpfs: increase memory reserve to a percent of available memory + swap > > > > [...] > > > > Add sysctl for vfs.tmpfs.memory_percent and the pre-existing > > vfs.tmpfs.memory_reserved to tmpfs(5). > > > > PR: 275436 > > MFC after: 1 month > > Reviewed by: rgrimes > > Differential Revision: https://reviews.freebsd.org/D43011 > > I just got: > > make[6]: Could not create temporary file /tmp/makeDl4i9S: > No space left on device > > after doing a buildworld -j4 on a 4 core, 16 GiB system where /tmp is a > tmpfs, with the prior buildworld having taken me past this commit, > which I strongly suspect to be the cause. Whilst I understand the > motivation behind your commits, this is a sad regression to have; it's > not exactly a particularly strange situation. FWIW, I've seen two people complain about this last week, apparently this kernel OOM protection doesn't work very well. :-/ ./danfe From nobody Mon Jan 22 05:01:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJJ3c1NpTz573B3; Mon, 22 Jan 2024 05:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJJ3c0yhhz54v4; Mon, 22 Jan 2024 05:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705899708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IUhgYl5kfVKHcw7yEixTmxINQHI5QNJoQ8tIVeP8VBQ=; b=Y6HD4TCi/sGU19dIennnJ881P4L02gQ8Qp3ydsCaI25JSqBXEgdiu3NQRYKQWsNID4K9om SaMvrgzuCvLezPw1n7jVpnlbqNDTP+smilMN3akWMCz1QttsefKVQzGcU1UMYX+nKXH2E5 hLF6TbmlWPkQvcn6wfY7W3A9vGEIx+PM69iTzSk/Vl+MhVDwEyPDS/+wy2qsviniyL6ysh RaWIJpQvfAN91IePZXkNtc74LMZbNT6kM6Q3YufBor4bZDMwIghh8XzHPF9fdUCfLF4U9a 8mKwSU4C40BaGGh1xo0K6z7rPLCvUpVEvmTNIkfEiVRs0wkSfw+1qfwI4Htq3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705899708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IUhgYl5kfVKHcw7yEixTmxINQHI5QNJoQ8tIVeP8VBQ=; b=nuJjyjWOfAJqrODd3vE5h2ycgaabEj+e954gAvZH+y5TOphJNxuKbvbTdiwIogFOc9ytCF rPigFozdQbDLalc0myV91brEleWM4yku/ZjIx8n/dk7qB90HN7KcBuotAgtBTZfm6vVANc fdH34oFGGQgHC7rigjfyMsKTfBHwXiCDufzokHpangWgF/R1QKQks15eQ5u3y6fIBqSzlo G28tSL5FFMvQyfmesGG31QnJbXdMqVRJuu+MIs4ny2FVzQIia1ObtK+qiT34dGUKTW82Op JnJMVLWrSK0GincYteiLDbVZ231N33lB7Z12DiIcB/glSIIkVl9O5UHWa5KiXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705899708; a=rsa-sha256; cv=none; b=jXOTgQDa9aLw/b/UkS+j+juwEWaEARkWCouLd6djzcLqCNunqOGw46QEOI7dFCERmlObPY udV3LajzAtny5sKeZ+bVJy6hK3ZIw2bEdXo/DRx6Dtsi3Z6hQX9l5nVuGQVElDonXbVoQb dRYWeP7gb5x7l3gd4dHTF7UgXy8OhAJSoTduPDkft1pjFTX9pkkJrHpmOQzN9Vu/iDjP44 ZOEsSBgeUIWqi1IJnyuRNAbVa44h7jY74hvbYnVpU5AzS+YT77ilU0I8iaxfFTPcgoPbV0 hGwdxqZXhE7uVTy+N1nsL5Afw/6DLrZzAdWmAsXIFOGYyCODf1p/U2y7x5oGmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJJ3c02Njznc9; Mon, 22 Jan 2024 05:01:48 +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 40M51lAt053597; Mon, 22 Jan 2024 05:01:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M51lgY053594; Mon, 22 Jan 2024 05:01:47 GMT (envelope-from git) Date: Mon, 22 Jan 2024 05:01:47 GMT Message-Id: <202401220501.40M51lgY053594@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: 0a586a7d756c - stable/14 - linuxkpi: correct zone item size for linux_mm_zone List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 0a586a7d756c47ef0e0171e32664467aea4279a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0a586a7d756c47ef0e0171e32664467aea4279a0 commit 0a586a7d756c47ef0e0171e32664467aea4279a0 Author: Konstantin Belousov AuthorDate: 2024-01-14 21:00:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-22 05:01:24 +0000 linuxkpi: correct zone item size for linux_mm_zone (cherry picked from commit 4958df5dabce62ef4e9e96b0d1bf62f3a6cce689) --- sys/compat/linuxkpi/common/src/linux_current.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_current.c b/sys/compat/linuxkpi/common/src/linux_current.c index bec53384361f..c342eb279caa 100644 --- a/sys/compat/linuxkpi/common/src/linux_current.c +++ b/sys/compat/linuxkpi/common/src/linux_current.c @@ -294,7 +294,7 @@ linux_current_init(void *arg __unused) uma_zone_reserve(linux_current_zone, lkpi_task_resrv); uma_prealloc(linux_current_zone, lkpi_task_resrv); linux_mm_zone = uma_zcreate("lkpimm", - sizeof(struct task_struct), NULL, NULL, NULL, NULL, + sizeof(struct mm_struct), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_reserve(linux_mm_zone, lkpi_task_resrv); uma_prealloc(linux_mm_zone, lkpi_task_resrv); From nobody Mon Jan 22 05:02:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJJ4C4Zw3z573XH; Mon, 22 Jan 2024 05:02: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 4TJJ4C48Ldz55Wh; Mon, 22 Jan 2024 05:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705899739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FrD480Ut3JT2TFIBewP06bQuAD+Pe8XALkubrPmXGzc=; b=cIJ3cuf6apx4CFT7zcwgp+8k/HxxZi4Ohd1xuEASw7ZYibqg8hy8Fzcj/o/bfTAdDxLwAj YIvEaz2Lw6dy/nw3Sy1scFVjxcJwAlzikXqiixAT6YuQVUAR+4y9IX8cwRC2dHVO9U4pBB QQArhdPbYX7K9eiRopK3tFq66D0Xpb6vVu2jdmcJmAEmaz8Mc9bG50eVCv1AgLsIoSH/QF Vb0MUUhsG8GUOE3Xw09KwYPmaMZQ3DxKYWTGIlQDFsqmEH2GdiWh2xyUYF3qb8Zh3GW35L XE4leU2KgAUbFKZcZ07/NTGDldOjxX96RJOajmDLW7pKJq12CY4ph7TW9tel2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705899739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FrD480Ut3JT2TFIBewP06bQuAD+Pe8XALkubrPmXGzc=; b=wLOpEQO4dghhHnx9UYm1PWES7dnLn1bHI+NtbwXUG9DNznYZdqvFlAIZkZVd4M2hAb54Af 95KoFVCV3S52jUxf5tCC/smTYTtE3cF0Og8RqUMo1O84Nl/ZXSWzBdFM84rn1XOYPT7ezi z/pKjCvypthjHt4B0/fPXM6ViNeBf91MeYB3U6xBXW3RkkvvW7RnabFfClNWdvrLCj+SZj dCnUDmBLpFZBNDU95hCuWyu1hE84tA4MAABOigMjMM6h+8Vrqya925RWNZWB1gValyaEZn 5geVZP/Kq9UBZWm6aYfm4JpOOD2Fzyds+bc9I8CJiFcLz+omrrDCSoZI26tkmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705899739; a=rsa-sha256; cv=none; b=mcd0PKY9U3SeIokae04+3KG3atiplR/3Q7JhO/XsHgtvZdp4GdRBzpvORR8ANLyS/7W+sX Y0vhqwIPPZV45d8WoAQwAhFMLpDuGT7+u4YnZODsQWEfJdJpKLhs8UZY1fY+XyyWH2bYbw isZVFsu31siTpwxwHnuUgVUdZZOBHcMtY7PvNWBDNZf92jv1kteAOawEL/scWJj1sTMCtr 8fcB1mAFLZefV/dBaYKoF8RC43wqwfxqke9pftzTQA3y9GYSPt75ikVHfU5yb5KrHiPf6+ DUpKYDULP1Bcm63wFLmhSvuySRjH45s/8wI6GvabeoPDeUtmWRV9+WxlLl9K6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJJ4C3C44zpD2; Mon, 22 Jan 2024 05:02: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 40M52JAY055848; Mon, 22 Jan 2024 05:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M52JjZ055845; Mon, 22 Jan 2024 05:02:19 GMT (envelope-from git) Date: Mon, 22 Jan 2024 05:02:19 GMT Message-Id: <202401220502.40M52JjZ055845@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: d0ed621ef2ce - stable/13 - linuxkpi: correct zone item size for linux_mm_zone List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d0ed621ef2ce64394166d9555a28658ba4bd3a33 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d0ed621ef2ce64394166d9555a28658ba4bd3a33 commit d0ed621ef2ce64394166d9555a28658ba4bd3a33 Author: Konstantin Belousov AuthorDate: 2024-01-14 21:00:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-22 05:01:56 +0000 linuxkpi: correct zone item size for linux_mm_zone (cherry picked from commit 4958df5dabce62ef4e9e96b0d1bf62f3a6cce689) --- sys/compat/linuxkpi/common/src/linux_current.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_current.c b/sys/compat/linuxkpi/common/src/linux_current.c index a054d1f40b2a..b193416f5fed 100644 --- a/sys/compat/linuxkpi/common/src/linux_current.c +++ b/sys/compat/linuxkpi/common/src/linux_current.c @@ -288,7 +288,7 @@ linux_current_init(void *arg __unused) uma_zone_reserve(linux_current_zone, lkpi_task_resrv); uma_prealloc(linux_current_zone, lkpi_task_resrv); linux_mm_zone = uma_zcreate("lkpimm", - sizeof(struct task_struct), NULL, NULL, NULL, NULL, + sizeof(struct mm_struct), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_reserve(linux_mm_zone, lkpi_task_resrv); uma_prealloc(linux_mm_zone, lkpi_task_resrv); From nobody Mon Jan 22 05:29:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJJh70bsQz575s7; Mon, 22 Jan 2024 05:29: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 4TJJh706Cnz56rk; Mon, 22 Jan 2024 05:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705901399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PJDmhnCIomFTrU9mnyS3ueB5JUcmITe2b+ep8o0x2ic=; b=dil9IbGYYmPaaKcgrT0eK4gdXMw5mFjspWAPARrP5OjOomOXSNisXKQFQHqsjSzeaI3IfW ULzY28xcuKLwdRt6ceVlfYUziOD1m7jdGWY8zYouGiHEm9NvlN1sLOqhkTbxSsLzBW1vLM 2l483AKc/wnTLw3XpCS+sjBbwyf6teGwG97b79yLHif/bLMclxuDl738kgWighQiz7a6I6 sdlRFu70JPw2iwipdmapqgAls2xlr2ZvCSpxJdhIReMvN3KLucghXARJepMX84yPbW+NCE 4D//6Di4ZAUhuk0nX5QpApzkQS+xlBbOGCgM7TYcdGZ+1+KZLkvvbC8+to974Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705901399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PJDmhnCIomFTrU9mnyS3ueB5JUcmITe2b+ep8o0x2ic=; b=YgLN2Zdbl9H4Lxk24ILSOXQ9veMkyv/AFv3m8rhq6pdVqBhOFY4FiAuwWqo6OO/UHiNoYT lNRbw/NQrsnIwg0eObjMD8nf/XTlkPJeFGgMGlvMwUQshtF4tEICQZBikRHEkC7tdH7yux YuhaSJKIF3hGt7Oh2tyxS82VdHZ0ICg+Aq+iD+10uBpQXoFJDH0Ws9XY1UKxFQYdz5jk5D LaGCk4Rpx879unGxmAaqBghTXXTScBwXX4Xlg0JEkFvuOIXQSvwgv9cxaULLlHNveZ0SBX qVhDnZRpLmpEyziJZzi3OqJefiM4dNXfjrvuksun+L+T1Yd+6A0+WQAJcINmDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705901399; a=rsa-sha256; cv=none; b=ByBUU+NRAHLdcyAt4m5gEIUQYtOlYuVYeayDKErsbjUH92YooXXwEu4GKT0gS+Fj+yqvzd VbiRWwiESN4r/xSIP+8O3+4yLi4FBGGkGYkYv1RWh1xf/1rHnOqdFGAoqA9XqOdzeFQFFB m3slbTvpci83yxinB3aa9oqDKXsGHNQbSVFU40A5uipEBENlCI7NysAYJxANLiJuSNlaQ8 NYzE8kF4EgrKqp6U2LRAhia6+Ukqye6cQs3FUHepXMNg8ZW64nDDgcg6PvOKzEownTU+U5 Ml4dUoDMSpbSzJaxey877XksBslK4ezmHq1x5uZDdb+x+/gWbituQGOYWFQV7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJJh66GgrzpBJ; Mon, 22 Jan 2024 05:29: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 40M5Tw8i090048; Mon, 22 Jan 2024 05:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M5TwC7090045; Mon, 22 Jan 2024 05:29:58 GMT (envelope-from git) Date: Mon, 22 Jan 2024 05:29:58 GMT Message-Id: <202401220529.40M5TwC7090045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4261507a5e3e - main - netlink.h: s/typeof/__typeof List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4261507a5e3e73ef6f9535935d22785056954b19 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4261507a5e3e73ef6f9535935d22785056954b19 commit 4261507a5e3e73ef6f9535935d22785056954b19 Author: Lexi Winter AuthorDate: 2024-01-18 02:34:39 +0000 Commit: John Baldwin CommitDate: 2024-01-22 02:15:14 +0000 netlink.h: s/typeof/__typeof typeof() does not exist in -std=c99 mode and the relevant #define is only for _KERNEL, so use __typeof here instead. Reviewed by: jhb MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1070 --- sys/netlink/netlink.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/netlink.h b/sys/netlink/netlink.h index 759bbed6139c..2cffa7299ef4 100644 --- a/sys/netlink/netlink.h +++ b/sys/netlink/netlink.h @@ -204,7 +204,7 @@ enum nlmsginfo_attrs { #define NL_ITEM_OK(_ptr, _len, _hlen, _LEN_M) \ ((_len) >= _hlen && _LEN_M(_ptr) >= _hlen && _LEN_M(_ptr) <= (_len)) -#define NL_ITEM_NEXT(_ptr, _LEN_M) ((typeof(_ptr))((char *)(_ptr) + _LEN_M(_ptr))) +#define NL_ITEM_NEXT(_ptr, _LEN_M) ((__typeof(_ptr))((char *)(_ptr) + _LEN_M(_ptr))) #define NL_ITEM_ITER(_ptr, _len, _LEN_MACRO) \ ((_len) -= _LEN_MACRO(_ptr), NL_ITEM_NEXT(_ptr, _LEN_MACRO)) From nobody Mon Jan 22 05:40:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJJwD6hrkz576x3; Mon, 22 Jan 2024 05:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJJwD5vvrz580L; Mon, 22 Jan 2024 05:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705902028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bwzzZ3ps6bAuRr1vn6gzMJn6c//hRVluqC8XiU5wfwc=; b=mMG1oHyEb8tiyL8Lv1PtxwzkQNcaZhvkyebv0ulCwuBTHhvwrq33Wan5rQo9tzhzIZmvn4 6w0IEMpnfWvU5B9JTmL2mnjUYEooy4YqnT+ULFa1an8pe70Gve44C4cJASor/NTXzPxKmu /EWY1fzGR7nJ8vIRJb2UxcbHDLxAlaDtOgRlP8OyDjit9BAzRqUgxpM/3GBWAW2ecNg1B1 x5eAtYvrN5glUONCyF7Ii6FRrivny2+sE29UCyy4W6AJVO2PR7Xll0fixZ+78WxK+eHBMk +TIbBFqUJfCLdkspjROL9otzR1Hw64Hi+Ulb+Y6RKhUnuQwZ+yg8Wu6gWYuSnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705902028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bwzzZ3ps6bAuRr1vn6gzMJn6c//hRVluqC8XiU5wfwc=; b=v4g1jvE/zxaDql0H+TSeg9wHjHT3zm0nZmKoouiRt2jLxI7Ylb2luu23K+TNWRWqke7Gzg Vk3rLAy4vyR2bKSXTagSnnTL5b7bbPgZgo4YrPtZC3aK0UASsLmSpN1O2nIXJx2YlhxmCS 4XrxRqZ6Uuv0FNjjoRjmD8eC019SjeI2Kfn7v5OgH2Al4d84ASzfpFzZStJF/lU1773gDI M3NR8dPa+J4QIsG9ks4c6NLThylBLfPeq1gVW/lVE0i2P5kklDDcOyiL0YFDSdsP77XahH eMyOAn10c9hdu4pG8fsDCiFJeXgc4QF5eb81o3uwYF8ZfwZu5GR43fMHKB7jOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705902028; a=rsa-sha256; cv=none; b=y4NI8mGCNwKo062mkiReKLR2OEK2ErQ8713XU+poNrpQ6FrK03Wea87uWx6X8z4pb2ZcqC crE+DtyYK3rixE4QxAx7/bQhkevYbb1Bw52MZ9VTjyQSUIUGQyI3P5wkesMC/zuO+jbXzG UMQCieMDpAFx7xltIpqY+7T2m1yNug3PX8FuaMsRRLPKcro7opcueFjJ5+5//8jFr6HAoQ X2OMuA+5GNV1r3Jj5BxvkCQYnBBkgXzKJmWVIB/YNtIVzs1BFPMO+5sxq0HMC5VecE+xi8 34wXvzBuf48fMNoH/4XQimW9l5ygnEYtR13bGE28ZuEWhi89Iq4BnIGiqTIXsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJJwD4zYpzqHf; Mon, 22 Jan 2024 05:40: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 40M5eSj8015564; Mon, 22 Jan 2024 05:40:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M5eSUc015561; Mon, 22 Jan 2024 05:40:28 GMT (envelope-from git) Date: Mon, 22 Jan 2024 05:40:28 GMT Message-Id: <202401220540.40M5eSUc015561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c8bf9f09ee3d - main - newfs_msdos.8: example for specific cluster size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8bf9f09ee3d5ac97d38218f2123893a7f1f0285 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c8bf9f09ee3d5ac97d38218f2123893a7f1f0285 commit c8bf9f09ee3d5ac97d38218f2123893a7f1f0285 Author: Alexander Ziaee AuthorDate: 2024-01-12 22:12:48 +0000 Commit: John Baldwin CommitDate: 2024-01-22 05:39:16 +0000 newfs_msdos.8: example for specific cluster size The usual use case in 2024 for newfs_msdosfs is creating filesystems on SD cards for older hardware. In most tutorials, they call the cluster size "allocation size". Therefore, add a small note next to cluster size that it is also called allocation size, and add an example for how to do this. Reviewed by: jhb Pull Request: https://github.com/freebsd/freebsd-src/pull/1045 --- sbin/newfs_msdos/newfs_msdos.8 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8 index 278612548dc4..efa69c058453 100644 --- a/sbin/newfs_msdos/newfs_msdos.8 +++ b/sbin/newfs_msdos/newfs_msdos.8 @@ -23,7 +23,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 14, 2018 +.Dd January 12, 2024 .Dt NEWFS_MSDOS 8 .Os .Sh NAME @@ -134,7 +134,7 @@ File system block size (bytes per cluster). This should resolve to an acceptable number of sectors per cluster (see below). .It Fl c Ar cluster-size -Sectors per cluster. +Sectors per cluster, also called allocation size. Acceptable values are powers of 2 in the range 1 through 128. If the block or cluster size are not specified, the code @@ -224,6 +224,12 @@ Create a file system, using default parameters, on newfs_msdos /dev/ada0s1 .Ed .Pp +Create a FAT32 filesystem with a 32K allocation size on +.Pa /dev/mmcsd0s1 : +.Bd -literal -offset indent +newfs_msdos -F 32 -A -c 64 /dev/mmcsd0s1 +.Ed +.Pp Create a standard 1.44M file system, with volume label .Ar foo , on From nobody Mon Jan 22 09:39:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJQD13TYpz57X1j; Mon, 22 Jan 2024 09:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJQD12xmdz4MmN; Mon, 22 Jan 2024 09:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6eaaEU9VGmDiw4oPDBDNir0VP1vRPM8q/wDdViSkO4=; b=tWDjbuZLESMir6oeeWylMbiiDHiTaSSXmBuzSw15jAyOkJM7HPgZrJUdGpuJ7jibYmeQZH oXh/Zl5cT8xYtscBccQ8FnyuwNrdE5c8ZD0TDVLxI4jI3ckNRUNp8ZhXxXW6zGHUYKnxQ0 G1uvVgRsEbxijIk+TliZpaKE0d7AKkXg36Z26/Y2JeeXQLRRtIphb4QOEDigI/JSHBBWPG usH+l5MAkpuL0idenp00h7n8sFbneOwDOq6Pw+KYhvmnluDVhMRZYq0jdvoV2wdiOT5Gw0 Hmc9i8ic8wmvt5jTNTfoxomhlPn+3frv5ddM00wvxDGPeUgWwQpAevgfbai1iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6eaaEU9VGmDiw4oPDBDNir0VP1vRPM8q/wDdViSkO4=; b=FORR9KPxEnwfqWrsuW3oykWLq24BK/QbMX/fe4494o7+Y1+9ml8yrvsnT+8H4i3jx91V5k 3FX3lhfs488WfZ5TRv6/Fag0syZDHxPqH3ZYqZMtuKWLTKJKXmA1Ae2zuiBDk6F4uN5KGC MCwLDeXK6pIBzoFdtQ7fdczC7VMv3KgchZ3mehfdRMnWaVkLC8VSQbuEgxjEWqdjKulJ6G P3oe1NZKMWLAUF95y1haBu8FDjwj6JAtmcG4kP+CTRDp68UcXGiSx/EDbO2bunOaojriGV uw+89tu394Ysrl0Vr1/41jAQn47rPu1bxkhYx/i2Kz9H5fLQY2Z1bzQOrlf1sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705916369; a=rsa-sha256; cv=none; b=nOpnQM3+RVezy/siEAGA+8b6oMWxeEKxI4OT0ygsZ8ZXwo7JGCehIa6GWFuACMmxL18Orc zWcH/XG6O25nK7cqZQCp6ID9+IXbwGys5BVoiWkgGgij65fEsTA9QrNGG2BFYurnSPCscK SE5JY0Lhx6pG2JnJPMq4OoqtezimTvXuvQNi84YVJyrA3hNKxCp3oYGiiti9qFPTRyiRxx yzkjncaEzlNjBvmLEqTGmnaFnDZ71BTRjRe+ItXLg1IwrgIlqgAQVS4RgZISRQM/J3vC34 RAkFXXbtdNesZQMsGlQCBljCaj6weA0pQktONu+kAyhX2bv26FBwe4bz1FuDLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJQD11pRFzwrY; Mon, 22 Jan 2024 09:39: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 40M9dTSu010652; Mon, 22 Jan 2024 09:39:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M9dTxi010649; Mon, 22 Jan 2024 09:39:29 GMT (envelope-from git) Date: Mon, 22 Jan 2024 09:39:29 GMT Message-Id: <202401220939.40M9dTxi010649@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: d1fdafc789df - stable/14 - jail: add security.jail.mlock_allowed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d1fdafc789dfd6c9ad4145ca0bcfde87b1ca818e Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d1fdafc789dfd6c9ad4145ca0bcfde87b1ca818e commit d1fdafc789dfd6c9ad4145ca0bcfde87b1ca818e Author: Baptiste Daroussin AuthorDate: 2024-01-04 14:09:44 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-22 09:39:16 +0000 jail: add security.jail.mlock_allowed when the parameter allow.mlock was added a way for jails to check if the parameter was set or now has not been added, this change covers it. MFC After: 3 days Reviewed by: jamie@ Differential Revision: https://reviews.freebsd.org/D43314 (cherry picked from commit 9fd978680db6495180a4d46f76529d344b003c80) --- sys/kern/kern_jail.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index e95008be42e8..91466c46bc62 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4393,6 +4393,10 @@ SYSCTL_PROC(_security_jail, OID_AUTO, mount_allowed, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, PR_ALLOW_MOUNT, sysctl_jail_default_allow, "I", "Processes in jail can mount/unmount jail-friendly file systems (deprecated)"); +SYSCTL_PROC(_security_jail, OID_AUTO, mlock_allowed, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, + NULL, PR_ALLOW_MLOCK, sysctl_jail_default_allow, "I", + "Processes in jail can lock/unlock physical pages in memory"); static int sysctl_jail_default_level(SYSCTL_HANDLER_ARGS) From nobody Mon Jan 22 09:39:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJQDZ5N2Cz57XHb; Mon, 22 Jan 2024 09:39: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 4TJQDZ3hctz4Mw5; Mon, 22 Jan 2024 09:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fgadJuXyz5474v846b7BV49qcSGwg4cO4oRKLE9eAA=; b=rrBc9WyT9AfAtbYYWDvNDPrIqITftAX6KkE6zKVdPLNmQVq9jUqs1RabC5Wqw3Nevnohjd sWKKUymt+1MUnQxb4U0IKno352Q/JzvKkHx5hBzVBeqREx0am6fXRuyCPG/TOMEHkJwVNG fMk5b0tcTXcvEK19V7M/XN/Cf/m/Jx/k2Bw34JzbdDylW511oru9E0YiyDnOtcCMP5rxwz NTi4oDh4vn7yxXrLjjuz0y9MnLRlSkxbU7sFKigJt/kw0fe5xSyEDmgT3aiMWBXs+e3q2m Trv2DqfgUK8P0ouyUJdvdlNsffI7ae2KHHzYdFv6FYp4RFzgC/OolqurRplNpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fgadJuXyz5474v846b7BV49qcSGwg4cO4oRKLE9eAA=; b=BNFoHVgegRR4p6X6WCum5gAzbihEUHI+y29yyjL1Lwc5Mx/8mmvH97OMwzctkml8Te37qf yhwYCKEnC8sXV8hwPU3y/AF3NYXhCbiJWLyooi+6rgnb4xBQ7tPrfwIkWfjwNpfRseHxsa Xq9ORViikapEnPVT3hqll3eNGAVU/sj/wCSoofjDgMgGq3pACZ/N/CcDSadrJ9OOU6AE5j wc/Nnon/Td1rTMoOAtNQrrhg4izhhZBHcWg9tr1/Up8wpKJEcm6lp5+ptabP756kEUjvtx YrtBbJpHcv4PkBeLia8RXHoaSfdFWjKV+J6Xj8LcZpjSmr1UPqAQSh5uRkbkxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705916398; a=rsa-sha256; cv=none; b=Xc9BawveWPMaGAOd7eusMxbTK7xrkXqRNQZZ0fypZALmJ7gBxU1RyaxIz9f4kCd7YOppFL qAHdNih78OyhgipisMrfOUv3zgPL92ztuZjY/q51oy7qK0pu+pZbphG6wXIwMg1s6m4b8m 8Apa8raKYmGUsg9Dela/KTEsRXwjLRalH8L0D/J0JeShBTig52XZ0XuuqmZDxQDhEAAvEe tojXfXwuKawUqwk1wFcd3f+BOPjQIQ88ZZswMyhkRWPPUxURpcEz/k++iyiqwMw1q0msvL rif6x/LVScZWddOsoSuW/lyYomsP04y1JZ6YsY6YlhTLFUJyziTYHiYiw1Oojw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJQDZ2lFxzwdv; Mon, 22 Jan 2024 09:39: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 40M9dweg010843; Mon, 22 Jan 2024 09:39:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M9dwff010840; Mon, 22 Jan 2024 09:39:58 GMT (envelope-from git) Date: Mon, 22 Jan 2024 09:39:58 GMT Message-Id: <202401220939.40M9dwff010840@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: 73e891526ebf - stable/13 - jail: add security.jail.mlock_allowed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 73e891526ebfda33ccc6162b0b41af46ee3a689c Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=73e891526ebfda33ccc6162b0b41af46ee3a689c commit 73e891526ebfda33ccc6162b0b41af46ee3a689c Author: Baptiste Daroussin AuthorDate: 2024-01-04 14:09:44 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-22 09:39:49 +0000 jail: add security.jail.mlock_allowed when the parameter allow.mlock was added a way for jails to check if the parameter was set or now has not been added, this change covers it. MFC After: 3 days Reviewed by: jamie@ Differential Revision: https://reviews.freebsd.org/D43314 (cherry picked from commit 9fd978680db6495180a4d46f76529d344b003c80) --- sys/kern/kern_jail.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 8b043687a75b..5c2da1048b7b 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4066,6 +4066,10 @@ SYSCTL_PROC(_security_jail, OID_AUTO, mount_allowed, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, PR_ALLOW_MOUNT, sysctl_jail_default_allow, "I", "Processes in jail can mount/unmount jail-friendly file systems (deprecated)"); +SYSCTL_PROC(_security_jail, OID_AUTO, mlock_allowed, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, + NULL, PR_ALLOW_MLOCK, sysctl_jail_default_allow, "I", + "Processes in jail can lock/unlock physical pages in memory"); static int sysctl_jail_default_level(SYSCTL_HANDLER_ARGS) From nobody Mon Jan 22 09:40:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJQFZ1w3Qz57XHl; Mon, 22 Jan 2024 09:40: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 4TJQFZ1bGLz4NDD; Mon, 22 Jan 2024 09:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTCgyehsZQSFhtAFeOBNqv5QiG3Xv5Wy2U8fIiTZI/o=; b=Yx/QILAWQwPrOS41Xm1ymnEtado3/2RVggK8bS4UaeUFgGdFfPvFVIch47Z9tNIzHY5Rh6 +P9OAgr+/8xROKQbz5Bsnhv9PRBQ+FgdpIvBmeQctiQnhuEuazzyyV9tmhZ+GWDpiRnVhL 4RyBnGeisJJUxglqtnbEooNSAEm8jLllCy/9n1Eop/70IomY8Dw/NenyYn92ebE0C2hZK5 cgrSX+OSZW4rvKQFfToa0p9EuzIdzesCOTwm726dTgSOiXJlX0tdAPjfFLKrdtEAVTUHXR pYiWC90j86osg5qjZn58+MCx5Rg7if2sY5B5H6GccHb0Q50/6qiK5gElJA8Nlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTCgyehsZQSFhtAFeOBNqv5QiG3Xv5Wy2U8fIiTZI/o=; b=o/A9es4BbGJH2fMJfG1RDG7IylQQo33jXSqos6yCXma4BLB8HrUt0XcSRzKwXQbgK1TFjr gCSrknUr5SFkUF0qmicDFsscyQXR0mGr+SbAiHotri8CQE3ByK28s+RzYRB5z3c7mdxY/l WP7EkwE1fS5E3+ulC5box4vMlAetX1u+fHZgEYE+OfsLXkk3s2f17aQJSbaJqbziz6RK05 T8EksAa8ZCgf/LQYf6MwYezJftLJQHoDKUWOKPRrlA0fLlaxLrbzNZYjD/+kZU661L+2JQ oB3p6TVs4CBMgruInXzhM1D9FxUXEAWgKnQ2OGjJ8Qulv1Z64nKOAMfPu6InHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705916450; a=rsa-sha256; cv=none; b=Sq3sl2HQ2w2rJOhBB9KpvSrLvkmZPZUgRgv8ftqu4cb5gKuEokLlmI9tPjsHvpjvwMkMjf 7DWfWUSqSZR340lbFlelZAJ0PtTCGtVHFzpn7dXh5HxOy3SoQyIPBeF7KNiTExCmrijFZm poAVr1TPQdanrmfto2S6MyMmJQUyTXPaG1DMo/l+1q6cHIJYp/BdUPhRtFx632hwgXOUis w3uHXVHqFiEJzPfAevT1swuBkehMiKCZkIRIXA3betSRb1aNfkaNqOi+9KdDNG5XZb0RK1 WBY8tx75Gw1cJKh/w+Gja+8rwwQOg0sku7eNQZ9TODTAnMg3RIrswc3u8gg34g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJQFZ0fgXzwJY; Mon, 22 Jan 2024 09:40: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 40M9eoqW019585; Mon, 22 Jan 2024 09:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M9eotg019582; Mon, 22 Jan 2024 09:40:50 GMT (envelope-from git) Date: Mon, 22 Jan 2024 09:40:50 GMT Message-Id: <202401220940.40M9eotg019582@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: 9d29be87d86c - stable/14 - pci_vendors: update to 2023-11-11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9d29be87d86c9bbaa5e07cc5dfeda31581de99aa Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9d29be87d86c9bbaa5e07cc5dfeda31581de99aa commit 9d29be87d86c9bbaa5e07cc5dfeda31581de99aa Author: Baptiste Daroussin AuthorDate: 2023-12-04 10:51:59 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-22 09:40:39 +0000 pci_vendors: update to 2023-11-11 (cherry picked from commit 01e286b54190620ceec85ef865a51eb79b5d81c0) --- share/misc/pci_vendors | 580 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 500 insertions(+), 80 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 50115d979327..bad1d0bd066b 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.09.22 -# Date: 2023-09-22 03:15:02 +# Version: 2023.11.11 +# Date: 2023-11-11 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,8 +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 + f1ab P41 Plus NVMe SSD (DRAM-less) [Echo Harbor] + f1ac P44 Pro NVMe SSD [Hollywood Beach] 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -773,6 +773,9 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front + 1028 22cb PERC H365i Front + 1028 22cc PERC H965i Front + 1028 22cd HBA465i Front 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -816,6 +819,8 @@ 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 + 1028 22d2 PERC H975i Front + 1028 22d3 PERC H975i 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 @@ -1055,6 +1060,7 @@ 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 + 1d49 0703 ThinkSystem M.2 RAID B540d-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1201,7 +1207,7 @@ 103c 8b17 ProBook 445 G9/455 G9 [Ryzen 7 Integrated Radeon GPU] 15ff Fenghuang [Zhongshan Subor Z+] 1607 Arden - 1636 Renoir + 1636 Renoir [Radeon RX Vega 6 (Ryzen 4000/5000 Mobile Series)] 1637 Renoir Radeon High Definition Audio Controller 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] 1043 16c2 Radeon Vega 8 @@ -1215,6 +1221,8 @@ 1681 Rembrandt [Radeon 680M] 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s + 1900 Phoenix3 + 1901 Phoenix4 3150 RV380/M24 [Mobility Radeon X600] 103c 0934 nx8220 3151 RV380 GL [FireMV 2400] @@ -3944,6 +3952,7 @@ 1849 5236 RX 6650 XT Challenger D OC 73f0 Navi 33 [Radeon RX 7600M XT] 73ff Navi 23 [Radeon RX 6600/6600 XT/6600M] + 1462 5021 MSI RX 6600XT MECH 2X 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB @@ -3960,6 +3969,7 @@ 7446 Navi 31 USB 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] + 1002 0e3b RX 7900 GRE [XFX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] @@ -4815,6 +4825,7 @@ 1014 04fb PCIe3 x16 20GB Cache 12Gb Quad SAS RAID+ Adapter(580B) 1014 04fc PCIe3 x8 12Gb Quad SAS RAID+ Adapter(580A) 04ed Internal Shared Memory (ISM) virtual PCI device + 0611 4769 Cryptographic Adapter 3022 QLA3022 Network Adapter 4022 QLA3022 Network Adapter ffff MPIC-2 interrupt controller @@ -5281,7 +5292,7 @@ 1646 VanGogh IOMMU 1647 VanGogh PCIe GPP Bridge 1648 VanGogh Internal PCIe GPP Bridge to Bus - 1649 VanGogh PSP/CCP + 1649 Family 19h PSP/CCP 164f Milan IOMMU 1650 Milan Data Fabric; Function 0 1651 Milan Data Fabric; Function 1 @@ -8439,6 +8450,7 @@ 764d PXI-2521 764e PXI-2522 764f PXI-2523 + 7652 PXIe-4080 7654 PXI-2796 7655 PXI-2797 7656 PXI-2798 @@ -8453,7 +8465,14 @@ 76a3 PXIe-6535B 76a4 PXIe-6536B 76a5 PXIe-6537B + 76d8 PXIe-4081 + 76d9 PXIe-4082 + 77a8 PXIe-6375 783e PXI-8368 + 7882 PXIe-6376 + 7883 PXIe-6378 + 799e PXIe-6386 + 799f PXIe-6396 9020 PXI-2501 9030 PXI-2503 9040 PXI-2527 @@ -8748,6 +8767,8 @@ 13e9 0070 Win/TV (Video Section) 036e Bt878 Video Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 + 0000 0004 Euresys PICOLO Pro 3E 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8768,6 +8789,23 @@ 14f1 0002 Bt878 Mediastream Controller PAL BG 14f1 0003 Bt878a Mediastream Controller PAL BG 14f1 0048 Bt878/832 Mediastream Controller + 1805 0101 Euresys PICOLO Tetra + 1805 0102 Euresys PICOLO Tetra + 1805 0103 Euresys PICOLO Tetra + 1805 0104 Euresys PICOLO Tetra + 1805 0105 Euresys PICOLO Tetra + 1805 0106 Euresys PICOLO Tetra + 1805 0107 Euresys PICOLO Tetra + 1805 0108 Euresys PICOLO Tetra + 1805 0201 Euresys PICOLO Tetra-X + 1805 0202 Euresys PICOLO Tetra-X + 1805 0203 Euresys PICOLO Tetra-X + 1805 0204 Euresys PICOLO Tetra-X + 1805 0401 Euresys PICOLO Tymo + 1805 0402 Euresys PICOLO Tymo + 1805 0403 Euresys PICOLO Tymo + 1805 0404 Euresys PICOLO Tymo + 1805 1001 Euresys PICOLO Junior 4 1822 0001 VisionPlus DVB card 1851 1850 FlyVideo'98 - Video 1851 1851 FlyVideo II @@ -8843,6 +8881,8 @@ 1852 1852 FlyVideo'98 (with FM Tuner) 0878 Bt878 Audio Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 (Audio Section) + 0000 0004 Euresys PICOLO Pro 3E (Audio Section) 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8865,6 +8905,23 @@ 14f1 0002 Bt878 Video Capture (Audio Section) 14f1 0003 Bt878 Video Capture (Audio Section) 14f1 0048 Bt878 Video Capture (Audio Section) + 1805 0101 Euresys PICOLO Tetra (Audio Section) + 1805 0102 Euresys PICOLO Tetra (Audio Section) + 1805 0103 Euresys PICOLO Tetra (Audio Section) + 1805 0104 Euresys PICOLO Tetra (Audio Section) + 1805 0105 Euresys PICOLO Tetra (Audio Section) + 1805 0106 Euresys PICOLO Tetra (Audio Section) + 1805 0107 Euresys PICOLO Tetra (Audio Section) + 1805 0108 Euresys PICOLO Tetra (Audio Section) + 1805 0201 Euresys PICOLO Tetra-X (Audio Section) + 1805 0202 Euresys PICOLO Tetra-X (Audio Section) + 1805 0203 Euresys PICOLO Tetra-X (Audio Section) + 1805 0204 Euresys PICOLO Tetra-X (Audio Section) + 1805 0401 Euresys PICOLO Tymo (Audio Section) + 1805 0402 Euresys PICOLO Tymo (Audio Section) + 1805 0403 Euresys PICOLO Tymo (Audio Section) + 1805 0404 Euresys PICOLO Tymo (Audio Section) + 1805 1001 Euresys PICOLO Junior 4 (Audio Section) 1822 0001 VisionPlus DVB Card 18ac d500 DViCO FusionHDTV5 Lite 270f fc00 Digitop DTT-1000 @@ -8991,6 +9048,10 @@ 1147 VScom 020 2 port parallel adaptor 2000 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge 10b5 9030 ATCOM AE400P Quad E1 PCI card + 2300 Euresys DOMINO Gamma + 2374 Euresys DOMINO Alpha + 2491 Euresys GRABLINK Value + 2493 Euresys GRABLINK Expert 2540 IXXAT CAN-Interface PC-I 04/PCI 2724 Thales PCSM Security Card 3376 Cosateq 4 Port CAN Card @@ -9106,6 +9167,7 @@ e1c5 0006 TA1-PCI4 9036 9036 9050 PCI <-> IOBus Bridge + 103c 10b0 82350 PCI GPIB 10b5 1067 IXXAT CAN i165 10b5 114e Wasco WITIO PCI168extended 10b5 1169 Wasco OPTOIO32standard 32 digital in, 32 digital out @@ -9117,6 +9179,7 @@ 10b5 2905 Alpermann+Velte PCI TS: Time Synchronisation Board 10b5 3196 Goramo PLX200SYN sync serial card 10b5 9050 PCI-I04 PCI Passive PC/CAN Interface + 11a9 5334 PDS4 12fe 0001 CAN-PCI/331 CAN bus controller 1369 8901 PCX11+ PCI 1369 8f01 VX222 @@ -9542,6 +9605,7 @@ 10be Tseng Labs International Co. 10bf Most Inc 10c0 Boca Research Inc. + 9135 iX3D Ultimate Rez 10c1 ICM Co., Ltd. 10c2 Auspex Systems Inc. 10c3 Samsung Semiconductors, Inc. @@ -12778,16 +12842,20 @@ 2331 GH100 [H100 PCIe] 2336 GH100 [H100] 2337 GH100 [H100 SXM5 64GB] + 2338 GH100 [H100 SXM5 96GB] 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] 233d GH100 [H100 96GB] 2342 GH100 [GH200 120GB] 2343 GH100 2345 GH100 [GH200 480GB] + 23b0 GH100 + 23f0 GH100 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] 2460 GA103M [GeForce RTX 3080 Ti Laptop GPU] + 2480 GA104 [Reserved Dev ID A] 2482 GA104 [GeForce RTX 3070 Ti] 2483 GA104 2484 GA104 [GeForce RTX 3070] @@ -12816,6 +12884,7 @@ 24ba GA104GLM [RTX A4500 Laptop GPU] 24bb GA104GLM [RTX A3000 Laptop GPU] 24bf GA104 [GeForce RTX 3070 Engineering Sample] + 24c0 GA104 [Initial Dev ID B] 24c7 GA104 [GeForce RTX 3060 8GB] 24c8 GA104 [GeForce RTX 3070 GDDR6X] 24c9 GA104 [GeForce RTX 3060 Ti GDDR6X] @@ -12843,6 +12912,7 @@ 2571 GA106 [RTX A2000 12GB] 2582 GA107 [GeForce RTX 3050 8GB] 2583 GA107 [GeForce RTX 3050 4GB] + 2584 GA107 [GeForce RTX 3050 6GB] 25a0 GA107M [GeForce RTX 3050 Ti Mobile] 25a2 GA107M [GeForce RTX 3050 Mobile] 25a3 GA107 @@ -12881,6 +12951,7 @@ 26b8 AD102GL [L40G] 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] + 2703 AD103 [GeForce RTX 4080 SUPER] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] @@ -12891,6 +12962,7 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b1 AD104GL [RTX 4500 Ada Generation] 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] @@ -13074,6 +13146,7 @@ 2011 Q-Motion Video Capture/Edit board 4750 S5930 [Matchmaker] 5920 S5920 + 801d Roper Scientific PCI TAXI interface 8043 LANai4.x [Myrinet LANai interface chip] 8062 S5933_PARASTATION 807d S5933 [Matchmaker] @@ -13147,6 +13220,7 @@ 1028 06e6 Latitude 11 5175 2-in-1 1028 09be Latitude 7410 1028 0b10 Precision 3571 + 1028 0c06 Precision 3580 17aa 224f ThinkPad X1 Carbon 5th Gen 5260 RTS5260 PCI Express Card Reader 5261 RTS5261 PCI Express Card Reader @@ -13160,6 +13234,7 @@ 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) + 5772 RTS5772DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -13342,13 +13417,17 @@ 8813 RTL8813AE 802.11ac PCIe Wireless Network Adapter 8821 RTL8821AE 802.11ac PCIe Wireless Network Adapter 8852 RTL8852AE 802.11ax PCIe Wireless Network Adapter + a85a RTL8852AE WiFi 6 802.11ax PCIe Adapter b723 RTL8723BE PCIe Wireless Network Adapter 10ec 8739 Dell Wireless 1801 17aa b736 Z50-75 + b821 RTL8821CE PCIe 802.11ac Wireless Network Controller b822 RTL8822BE 802.11a/b/g/n/ac WiFi adapter 103c 831b Realtek RTL8822BE 802.11ac 2x2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported) 17aa 5124 ThinkPad E595 17aa b023 ThinkPad E595 + b852 RTL8852BE PCIe 802.11ax Wireless Network Controller + b85b RTL8852BE PCIe 802.11ax Wireless Network Controller [1T1R] c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter c822 RTL8822CE 802.11ac PCIe Wireless Network Adapter c82f RTL8822CE 802.11ac PCIe Wireless Network Adapter @@ -13379,6 +13458,8 @@ 500c Alveo U280 XDMA Platform 5020 Alveo U50 XMDA Platform 505c Alveo U55C + 5074 Alveo X3522, Quad Port, 10/25GbE Adaptable Accelerator Card + 5084 Alveo X3522, Quad Port, 10/25GbE Low Latency Network Adapter 6987 SmartSSD 6988 SmartSSD 7011 7-Series FPGA Hard PCIe block (AXI/debug) @@ -15366,7 +15447,7 @@ 1179 0021 KIOXIA CD5 series SSD 1d49 4039 Thinksystem U.2 CM5 NVMe SSD 1d49 403a Thinksystem AIC CM5 NVMe SSD - 0113 BG3 NVMe SSD Controller + 0113 BG3 x2 NVMe SSD Controller (DRAM-less) 1179 0001 Toshiba KBG30ZMS128G 128GB NVMe SSD 0115 XG4 NVMe SSD Controller 0116 XG5 NVMe SSD Controller @@ -15686,6 +15767,8 @@ 000b ATP867-B 000d ATP8620 000e ATP8620 + 0011 ATP865-B + 1191 0011 ACARD AEC-6280 8002 AEC6710 SCSI-2 Host Adapter 8010 AEC6712UW SCSI 8020 AEC6712U SCSI @@ -15949,7 +16032,7 @@ 6281 88F6281 [Kirkwood] ARM SoC # This device ID was used for earlier chips. 6381 MV78xx0 [Discovery Innovation] ARM SoC - 6440 88SE6440 SAS/SATA PCIe controller + 6440 88SE63x0 x1, 88SE6440 x4 PCIe SAS/SATA 3Gb/s RAID controller 6450 64560 System Controller 6460 MV64360/64361/64362 System Controller 6480 MV64460/64461/64462 System Controller @@ -15960,7 +16043,7 @@ 6820 88F6820 [Armada 385] ARM SoC 6828 88F6828 [Armada 388] ARM SoC 6920 88F6920 [Armada 390] ARM SoC - 7042 88SX7042 PCI-e 4-port SATA-II + 7042 88SX7042 PCIe 4-port SATA-II controller 16b8 434b Tempo SATA E4P 7810 MV78100 [Discovery Innovation] ARM SoC 7820 MV78200 [Discovery Innovation] ARM SoC @@ -16426,9 +16509,9 @@ 13f7 1394 OHCI Compliant Host Controller 6729 OZ6729 673a OZ6730 - 6832 OZ6832/6833 CardBus Controller - 6836 OZ6836/6860 CardBus Controller - 6872 OZ6812 CardBus Controller + 6832 OZ6832/6833 CardBus Controller [Saturn] + 6836 OZ6836/6860 CardBus Controller [Mercury] + 6872 OZ6812 CardBus Controller [Challenger] 6925 OZ6922 CardBus Controller 6933 OZ6933/711E1 CardBus/SmartCardBus Controller 1025 1016 Travelmate 612 TX @@ -16602,6 +16685,7 @@ 00a3 VisionLink F4 00a9 VisionLink CLS 00ab PCIe8g3 A5 10G + 00b5 PCIe8 RFx SDR 123e Simutech, Inc. # nee C-Cube Microsystems / acquired by Magnum Semiconductor 123f LSI Logic @@ -16834,6 +16918,8 @@ 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers + 2269 SM2269XT (DRAM-less) NVMe SSD Controller + 8366 SM8366 NVMe SSD Controller [MonTitan] 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17461,11 +17547,18 @@ 0035 PCI-DAS64/M1/16 0036 PCI-DAS64/M2/16 0037 PCI-DAS64/M3/16 + 004b PCI-MDB64 004c PCI-DAS1000 004d PCI-QUAD04 0052 PCI-DAS4020/12 0053 PCIM-DDA06/16 0054 PCI-DIO96 + 0055 CPCI-DIO24H + 0056 PCIM-DAS1602/16 + 0057 PCI-DAS3202/16 + 0059 PCI-QUAD-AC5 + 005a CPCI-DIO96H + 005b CPCI-DIO48H 005d PCI-DAS6023 005e PCI-DAS6025 005f PCI-DAS6030 @@ -17478,10 +17571,23 @@ 0066 PCI-DAS6052 0067 PCI-DAS6070 0068 PCI-DAS6071 + 006e PCI-CTR10 006f PCI-DAS6036 0070 PCI-DAC6702 + 0071 PCI-DAC6703 + 0074 PCI-CTR20HD + 0077 PCI-DIO24/LP 0078 PCI-DAS6013 0079 PCI-DAS6014 + 007b PCIM-DAS16JR/16 + 007e PCI-DIO24/S + 00a5 PCI-2511 + 00a6 PCI-2513 + 00a7 PCI-2515 + 00a8 PCI-2517 + 00be PCI-QUAD05 + 00da PCIe-DIO96H + 00db PCIe-DIO24 0115 PCIe-DAS1602/16 1308 Jato Technologies Inc. 0001 NetCelerator Adapter @@ -17643,6 +17749,9 @@ 1344 4000 3.2TB U.2 1344 5000 6.4 TB U.2 1344 6000 12.8TB U.2 + 51b7 7500 PRO NVMe SSD + 51b8 7500 MAX NVMe SSD + 51b9 6500 ION NVMe SSD 51c0 7400 PRO NVMe SSD 1028 2162 EC NVMe OPAL 7400 RI M.2 480GB 1028 2163 EC NVMe OPAL 7400 RI M.2 960GB @@ -17689,6 +17798,7 @@ 5411 2450 NVMe SSD [HendrixV] (DRAM-less) 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD + 5416 2550 NVMe SSD (DRAM-less) 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc 1347 Odetics @@ -17727,8 +17837,97 @@ 1355 Kratos Analytical Ltd 1356 The Logical Co 1359 Prisa Networks -135a Brain Boxes - 0a61 UC-324 [VELOCITY RS422/485] +135a Brainboxes Ltd + 0841 UC-268 4 port RS-232 card + 0861 UC-257 2 port RS-232 + LPT card + 0862 UC-257 2 port RS-232 + LPT card + 0863 UC-257 2 port RS-232 + LPT card + 0881 UC-279 8 port RS-232 card + 08a1 UC-313 2 port RS-422/485 card + 08a2 UC-313 2 port RS-422/485 card + 08a3 UC-313 2 port RS-422/485 card + 08c1 UC-310 2 port RS-422/485 Opto Isolated card + 08e1 UC-302 2 port RS-232 card + 08e2 UC-302 2 port RS-232 card + 08e3 UC-302 2 port RS-232 card + 0901 UC-431 3 port RS-232 card + 0921 UC-420 3 + 1 port RS-232 card + 0981 UC-475 1 + 1 port RS-232 + LPT card + 0982 UC-475 1 + 1 port RS-232 + LPT card + 09a1 UC-607 2 port RS-232 card + 09a2 UC-607 2 port RS-232 card + 09a3 UC-607 2 port RS-232 card + 0a61 UC-324 1 port RS-422/485 card + 0a81 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a82 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a83 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0aa1 UC-246 1 port RS-232 card + 0aa2 UC-246 1 port RS-232 card + 0ac1 UP-189 Powered 2 port RS-232 card + 0ac2 UP-189 Powered 2 port RS-232 card + 0ac3 UP-189 Powered 2 port RS-232 card + 0b01 UC-346 4 port RS-422/485 card + 0b02 UC-346 4 port RS-422/485 card + 0b21 UP-200 Powered 2 port RS-232 card + 0b22 UP-200 Powered 2 port RS-232 card + 0b23 UP-200 Powered 2 port RS-232 card + 0ba1 UC-101 1 + 1 port RS-232 card + 0bc1 UC-203 1 + 1 port RS-232 + LPT card + 0bc2 UC-203 1 + 1 port RS-232 + LPT card + 0be1 UC-146 LPT card + 0be2 UC-146 LPT card + 0c01 UP-869 Powered 2 port RS-232 card + 0c02 UP-869 Powered 2 port RS-232 card + 0c03 UP-869 Powered 2 port RS-232 card + 0c21 UP-880 Powered 2 port RS-232 card + 0c22 UP-880 Powered 2 port RS-232 card + 0c23 UP-880 Powered 2 port RS-232 card + 0c41 UC-368 4 port RS-422/485 Opto Isolated card + 0ca1 UC-253 2 port RS-232 card + 0d21 UC-260 4 port RS-232 card + 0d41 UC-836 4 port RS-232 card + 0d60 IS-100 1 port RS-232 card + 0d80 IS-200 2 port RS-232 card + 0da0 IS-300 1 port RS-232 + LPT card + 0dc0 IS-400 4 port RS-232 card + 0de0 IS-500 LPT card + 0e41 PX-279 8 port RS-232 card + 0e61 UC-414 3 + 1 port RS-232 + LPT card + 4000 PX-420 3 + 1 port RS-232 card + 4001 PX-431 3 port RS-232 card + 4002 PX-820 Powered 3 + 1 port RS-232 card + 4003 PX-831 Powered 3 port RS-232 card + 4004 PX-235 1 port RS-232 card + 4005 PX-101 1 + 1 port RS-232 card + 4006 PX-257 1 + 1 port RS-232 + LPT card (Serial port) + 4007 PX-257 1 + 1 port RS-232 + LPT card (LPT port) + 4008 PX-835 Powered 1 port RS-232 card + 4009 PX-857 Powered 2 port RS-232 card + 400a PX-260 4 port RS-232 card + 400b PX-320 1 port RS-422/485 card + 400c PX-313 2 port RS-422/485 card + 400e PX-310 2 port RS-422/485 Opto Isolated card + 400f PX-346 4 port RS-422/485 card + 4010 PX-368 4 port RS-422/485 Opto Isolated card + 4011 PX-420 3 + 1 port RS-232 card + 4012 PX-431 3 port RS-232 card + 4013 PX-820 Powered 3 + 1 port RS-232 card + 4014 PX-831 Powered 3 port RS-232 card + 4015 PX-257 2 port RS-232 card + 4016 PX-235 1 port RS-232 card + 4017 PX-835 Powered 1 port RS-232 card + 4018 PX-857 Powered 2 port RS-232 card + 4019 PX-101 1 + 1 port RS-232 card + 401c PX-146 LPT card + 401d PX-475 1 port RS-232 + LPT card (Serial port) + 401e PX-803 Powered 1 + 1 port RS-232 card + 401f PX-475 1 port RS-232 + LPT card (LPT port) + 4027 IX-100 1 port RS-232 card + 4028 IX-200 2 port RS-232 card + 4029 IX-400 4 port RS-232 card + 402a IX-500 LPT card + 402c PX-263 4 port RS-232 + LPT card + 4100 PX-272 4 + 1 port RS-232 + LPT card 135b Giganet Inc 135c Quatech Inc 0010 QSC-100 @@ -17738,12 +17937,19 @@ 0050 ESC-100D 0060 ESC-100M 00f0 MPAC-100 Synchronous Serial Card (Zilog 85230) + 0120 QSCP-100 + 0130 DSCP-100 + 0140 QSCP-200/300 + 0150 DSCP-200/300 0170 QSCLP-100 0180 DSCLP-100 + 0181 DSC-100 0190 SSCLP-100 01a0 QSCLP-200/300 01b0 DSCLP-200/300 + 01b1 DSC-200/300 01c0 SSCLP-200/300 + 01e0 ESC(LP)-100 0258 DSPSX-200/300 135d ABB Network Partner AB 135e Sealevel Systems Inc @@ -18233,6 +18439,7 @@ 13fc Computer Peripherals International 13fd Micro Science Inc 13fe Advantech Co. Ltd + 0071 PCIE-1761H, 8-ch Relay and 8-ch Isolated Digital Input Card 1240 PCI-1240 4-channel stepper motor controller card 1600 PCI-16xx series PCI multiport serial board (function 0) # This board has two PCI functions, appears as two PCI devices @@ -19391,9 +19598,9 @@ 144d a801 SM963 2.5" NVMe PCIe SSD a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 - 144d a801 SSD 970 EVO + 144d a801 SSD 970 EVO/PRO 1d49 403b Thinksystem U.2 PM983 NVMe SSD - a809 NVMe SSD Controller 980 + a809 NVMe SSD Controller 980 (DRAM-less) a80a NVMe SSD Controller PM9A1/PM9A3/980PRO 0128 215a DC NVMe PM9A3 RI U.2 960GB 0128 215b DC NVMe PM9A3 RI U.2 1.92TB @@ -19413,9 +19620,12 @@ 1028 2276 DC NVMe PM9A3 RI 110M.2 960GB 1028 2277 DC NVMe PM9A3 RI 110M.2 1.92TB 1028 512d DC NVMe PM9A3 RI U.2 7.68TB + 144d a801 SSD 980 PRO 144d a813 General DC NVMe PM9A3 - a80b NVMe SSD Controller PM9B1 +# Actually 88SS1322 according to techpowerup + a80b NVMe SSD Controller PM9B1 (DRAM-less) a80c NVMe SSD Controller S4LV008[Pascal] + a80d NVMe SSD Controller PM9C1a a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -19658,9 +19868,18 @@ 14a2 Millennium Engineering Inc 14a3 Maverick Networks 14a4 Lite-On Technology Corporation + 2100 CA1-8D128 NVMe SSD + 2200 CX2-8B256, CX2-8B512 NVMe SSD + 22a0 EP2-KB960 NVMe SSD 22f1 M8Pe Series NVMe SSD + 2300 CA3-8D256, CA3-8D512 NVMe SSD + 23f1 M9PeG, M9PeGN, M9PeY NVMe SSD + 2f00 CAZ-82512 NVMe SSD + 3500 CA5-8D512 NVMe SSD # Wrong vendor ID used 4318 Broadcom BCM4318 [AirForce One 54g] 802.11g WLAN Controller + 5100 CB1-SD256, CB1-SD512 NVMe SSD + 9100 CL1-3D256, CL1-8D512 NVMe SSD (DRAM-less) 14a5 XIONICS Document Technologies Inc 14a6 INOVA Computers GmBH & Co KG 14a7 MYTHOS Systems Inc @@ -19729,12 +19948,14 @@ 7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter 7615 MT7615E 802.11ac PCI Express Wireless Network Adapter 7630 MT7630e 802.11bgn Wireless Network Adapter + 7650 MT7650 802.11ac # 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 + 1a3b 5300 ASUS PCE-AXE59BT 7961 MT7921 802.11ax PCI Express Wireless Network Adapter 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB @@ -19980,8 +20201,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 + 14e4 d166 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d366 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20542,16 +20763,16 @@ 4360 BCM4360 802.11ac Wireless Network Adapter 4365 BCM43142 802.11b/g/n 1028 0016 Wireless 1704 802.11n + BT 4.0 - 43a0 BCM4360 802.11ac Wireless Network Adapter - 43a1 BCM4360 802.11ac Wireless Network Adapter - 43a2 BCM4360 802.11ac Wireless Network Adapter + 43a0 BCM4360 802.11ac Dual Band Wireless Network Adapter + 43a1 BCM4360 802.11ac 2,4G Wireless Network Adapter + 43a2 BCM4360 802.11ac 5G Wireless Network Adapter 43a3 BCM4350 802.11ac Wireless Network Adapter # Manufactured by Foxconn for Lenovo 17aa 075a 00JT494 43a9 BCM43217 802.11b/g/n 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter - 43b1 BCM4352 802.11ac Wireless Network Adapter + 43b1 BCM4352 802.11ac Dual Band 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 @@ -20577,12 +20798,14 @@ 441f BCM4361 802.11ac Dual-Band Wireless Network Controller 4420 BCM4361 802.11ac 2.4 GHz Wireless Network Controller 4421 BCM4361 802.11ac 5 GHz Wireless Network Controller - 4425 BRCM4378 Wireless Network Adapter + 4425 BCM4378 802.11ax Dual Band Wireless Network Adapter 4430 BCM44xx CardBus iLine32 HomePNA 2.0 4432 BCM4432 CardBus 10/100BaseT + 4433 BCM4387 802.11ax Dual Band Wireless LAN Controller 4464 BCM4364 802.11ac Wireless Network Adapter # brcmfmac reports it as BCM4377/4 but macOS drivers call it BCM4377b 4488 BCM4377b Wireless Network Adapter + 449d BCM43752 802.11ax Dual Band Wireless LAN Controller 4610 BCM4610 Sentry5 PCI to SB Bridge 4611 BCM4610 Sentry5 iLine32 HomePNA 1.0 4612 BCM4610 Sentry5 V.90 56k Modem @@ -20900,6 +21123,10 @@ 17de 08a6 KWorld/VStream XPert DVB-T 17de 08b2 KWorld DVB-S 100 17de a8a6 digitalnow DNTV Live! DVB-T + 1805 0111 PICOLO Jet-X Video + 1805 0112 PICOLO Jet-X Video + 1805 0113 PICOLO Jet-X Video + 1805 0114 PICOLO Jet-X Video 1822 0025 digitalnow DNTV Live! DVB-T Pro 185b e000 VideoMate X500 18ac d500 FusionHDTV 5 Gold @@ -20928,6 +21155,10 @@ 14f1 0187 Conexant DVB-T reference design 17de 08a1 XPert DVB-T PCI BDA DVBT 23880 Transport Stream Capture 17de 08a6 KWorld/VStream XPert DVB-T + 1805 0111 PICOLO Jet-X Jpeg + 1805 0112 PICOLO Jet-X Jpeg + 1805 0113 PICOLO Jet-X Jpeg + 1805 0114 PICOLO Jet-X Jpeg 18ac d500 DViCO FusionHDTV5 Gold 18ac d810 DViCO FusionHDTV3 Gold-Q 18ac d820 DViCO FusionHDTV3 Gold-T @@ -20940,6 +21171,10 @@ 0070 6902 WinTV HVR-4000-HD 0070 9002 Nova-T DVB-T Model 909 0070 9402 WinTV-HVR1100 DVB-T/Hybrid + 1805 0111 PICOLO Jet-X Control + 1805 0112 PICOLO Jet-X Control + 1805 0113 PICOLO Jet-X Control + 1805 0114 PICOLO Jet-X Control 7063 5500 pcHDTV HD-5500 8811 CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port] 0070 3400 WinTV 34604 @@ -21283,6 +21518,8 @@ 0001 Eagle Cluster Manager 0002 Osprey Cluster Manager 0003 Harrier Cluster Manager + 0371 Cassini 2 [Slingshot 400Gb] + 0372 Cassini 2 [Slingshot 400Gb] SR-IOV VF a01d FC044X Fibre Channel HBA 1591 ARN 1592 Syba Tech Ltd @@ -21627,10 +21864,10 @@ 2001 Skyhawk Series NVME SSD 5001 WD Black 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 / Red SN700 NVMe SSD + 5003 WD Blue SN500 / PC SN520 x2 M.2 2280 NVMe SSD + 5004 PC SN520 x2 M.2 2230 NVMe SSD + 5005 PC SN520 x2 M.2 2242 NVMe SSD + 5006 SanDisk Extreme Pro / WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD @@ -21639,17 +21876,18 @@ 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5014 WD PC SN540 / 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 + 5019 WD Green SN350 240GB (DRAM-less) / SN560E NVMe SSD + 501a SanDisk Ultra 3D / WD Blue SN570 NVMe SSD (DRAM-less) 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) + 5028 WD CH SN560 NVMe SSD 5030 WD Black SN850X NVMe SSD 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH @@ -21673,7 +21911,11 @@ 117c 0022 Celerity FC-42XS Fibre Channel Adapter 117c 0025 Celerity FC-44ES Fibre Channel Adapter 117c 0026 Celerity FC-42ES Fibre Channel Adapter + 0b01 82350B PCI GPIB 1100 E8001-66442 PCI Express CIC + 1218 82351A PCI Express GPIB + 12d6 82350C PCI GPIB + 12d7 82351B PCI Express GPIB 2922 64 Bit, 133MHz PCI-X Exerciser & Protocol Checker 2928 64 Bit, 66MHz PCI Exerciser & Analyzer 2929 64 Bit, 133MHz PCI-X Analyzer & Exerciser @@ -21927,6 +22169,11 @@ 165f Linux Media Labs, LLC 1020 LMLM4 MPEG-4 encoder 1661 Worldspace Corp. +1665 EDAX Inc +# P/N 4035.006.19720 + 1973 DPP-II FR2 Board +# P/N 4035.065.20000 + 2000 SG-IIP Board 1668 Actiontec Electronics Inc 0100 Mini-PCI bridge # Formerly SiByte, Inc. @@ -22861,6 +23108,7 @@ 17d5 7831 X3120 Dual Port 10GBase-CR 17db Cray Inc 0101 XT Series [Seastar] 3D Toroidal Router + 0501 Cassini 1 [Slingshot 200Gb] 17de KWorld Computer Co. Ltd. 17df Dini Group 1864 Virtex4 PCI Board w/ QL5064 Bridge [DN7000K10PCI/DN8000K10PCI/DN8000K10PSX/NOTUS] @@ -22978,6 +23226,35 @@ 1804 Ralink corp. (wrong ID) 3060 RT3060 Wireless 802.11n 1T/1R 1805 Euresys S.A. + 0201 PICOLO Alert PCI + 0202 PICOLO Diligent + 0204 PICOLO Alert-RC + 0205 PICOLO Alert PCIe + 0206 PICOLO Diligent Plus PCIe + 0207 PICOLO Alert-RC PCIe + 0300 GRABLINK Expert 2 + 0301 GRABLINK Quickpack ColorScan + 0302 GRABLINK Value cPCI + 0303 GRABLINK Expert 2 cPCI + 0305 GRABLINK Avenue + 0306 GRABLINK Quickpack CFA + 0307 GRABLINK Express + 0308 GRABLINK Quickpack CFA PCIe + 0309 GRABLINK Quickpack CFA PCIe (Recovery) + 030a GRABLINK Full + 030b GRABLINK Full (Recovery) + 030c GRABLINK DualBase + 030d GRABLINK DualBase (Recovery) + 030e GRABLINK Base + 030f GRABLINK Base (Recovery) + 0310 GRABLINK Full XR + 0311 GRABLINK Full XR (Recovery) + 0401 DOMINO Iota + 0402 DOMINO Alpha 2 + 0403 DOMINO Harmony + 0404 DOMINO Melody + 0407 DOMINO Symphony + 0408 DOMINO Symphony PCIe 1809 Lumanate, Inc. 180c IEI Integration Corp 1813 Ambient Technologies Inc @@ -23710,11 +23987,13 @@ 5007 E7 NVMe Controller 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller - 5013 PS5013 E13 NVMe Controller + 5013 PS5013-E13 PCIe3 NVMe Controller (DRAM-less) + 5015 PS5015-E15 PCIe3 NVMe Controller (DRAM-less) 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) + 5026 PS5026-E26 PCIe5 NVMe Controller 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile @@ -24246,6 +24525,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0011 QEMU PVPanic device 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine @@ -24291,6 +24571,7 @@ 1028 2151 BOSS-N1 Modular ET 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter + 1b96 4000 WD_BLACK AN1500 NVMe SSD 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 @@ -24380,6 +24661,12 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 2700 Ultrastar DC SN650 NVMe SSD + 2701 Ultrastar DC SN650 NVMe SSD + 2702 Ultrastar DC SN650 NVMe SSD + 2720 Ultrastar DC SN650 NVMe SSD + 2721 Ultrastar DC SN650 NVMe SSD + 2722 Ultrastar DC SN655 NVMe SSD 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD @@ -24500,6 +24787,10 @@ 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD +# 2TB + 5021 FireCuda 520 SSD +# 1TB + 5026 FireCuda 540 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder 4309 BC-08240A MPEG4 4 port video encoder / decoder @@ -24559,6 +24850,7 @@ 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH + 0002 CAN-IB100/PCIe 0003 CAN-IB200/PCIe 1bef Lantiq 0011 MIPS SoC PCI Express Port @@ -24566,6 +24858,7 @@ 0001 SentinelEX 7011 RX0xxx 1bf5 Greenliant + 1000 G7200 series U.2 NVMe SSD 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24699,6 +24992,8 @@ 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive 284a PE8110 Series NVMe Solid State Drive 2a49 PE9110 Series NVMe Solid State Drive + 2a59 PE9010 Series NVMe Solid State Drives + 2b59 PS10x0 Series NVMe Solid State Drives 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24721,11 +25016,18 @@ 1c5f 0b40 NVMe SSD PBlaze6 6530 7680G AIC 1c5f 0b41 NVMe SSD PBlaze6 6530 7680G 2.5" U.2 1c5f 0b47 NVMe SSD PBlaze6 6630 7680G 2.5" U.2 + 1c5f 1320 NVMe SSD PBlaze6 6531 1920G AIC 1c5f 1321 NVMe SSD PBlaze6 6531 1920G 2.5" U.2 + 1c5f 1330 NVMe SSD PBlaze6 6531 3840G AIC 1c5f 1331 NVMe SSD PBlaze6 6531 3840G 2.5" U.2 + 1c5f 1340 NVMe SSD PBlaze6 6531 7680G AIC 1c5f 1341 NVMe SSD PBlaze6 6531 7680G 2.5" U.2 + 1c5f 1421 NVMe SSD PBlaze6 6541 1920G 2.5" U.2 + 1c5f 1427 NVMe SSD PBlaze6 6641 1920G 2.5" U.2(dual port) 1c5f 1431 NVMe SSD PBlaze6 6541 3840G 2.5" U.2 + 1c5f 1437 NVMe SSD PBlaze6 6641 3840G 2.5" U.2(dual port) 1c5f 1441 NVMe SSD PBlaze6 6541 7680G 2.5" U.2 + 1c5f 1447 NVMe SSD PBlaze6 6641 7680G 2.5" U.2(dual port) 1c5f 4b20 NVMe SSD PBlaze6 6536 1600G AIC 1c5f 4b21 NVMe SSD PBlaze6 6536 1600G 2.5" U.2 1c5f 4b25 NVMe SSD PBlaze6 6536 1600G E1.S @@ -24737,11 +25039,18 @@ 1c5f 4b40 NVMe SSD PBlaze6 6536 6400G AIC 1c5f 4b41 NVMe SSD PBlaze6 6536 6400G 2.5" U.2 1c5f 4b47 NVMe SSD PBlaze6 6636 6400G 2.5" U.2 + 1c5f 5320 NVMe SSD PBlaze6 6537 1600G AIC 1c5f 5321 NVMe SSD PBlaze6 6537 1600G 2.5" U.2 + 1c5f 5330 NVMe SSD PBlaze6 6537 3200G AIC 1c5f 5331 NVMe SSD PBlaze6 6537 3200G 2.5" U.2 + 1c5f 5340 NVMe SSD PBlaze6 6537 6400G AIC 1c5f 5341 NVMe SSD PBlaze6 6537 6400G 2.5" U.2 + 1c5f 5421 NVMe SSD PBlaze6 6547 1600G 2.5" U.2 + 1c5f 5427 NVMe SSD PBlaze6 6647 1600G 2.5" U.2(dual port) 1c5f 5431 NVMe SSD PBlaze6 6547 3200G 2.5" U.2 + 1c5f 5437 NVMe SSD PBlaze6 6647 3200G 2.5" U.2(dual port) 1c5f 5441 NVMe SSD PBlaze6 6547 6400G 2.5" U.2 + 1c5f 5447 NVMe SSD PBlaze6 6647 6400G 2.5" U.2(dual port) 003d PBlaze5 920/926 1c5f 0a30 NVMe SSD PBlaze5 920 3840G AIC 1c5f 0a31 NVMe SSD PBlaze5 920 3840G 2.5" U.2 @@ -24764,11 +25073,28 @@ 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 0431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c31 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c41 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 0c51 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 1430 NVMe SSD PBlaze7 7940 3840G AIC *** 479 LINES SKIPPED *** From nobody Mon Jan 22 09:41:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJQFq3Gclz57X8m; Mon, 22 Jan 2024 09:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJQFq32XWz4NL7; Mon, 22 Jan 2024 09:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KrMULZhJRsoG/TtwANPHyR42QbPIXMpTJuzoMHAiuY=; b=nG/GiJJct1u5FG3LJAAXE1YFEXKswslqbvbxRlblT2D6n4+NuUtPRT/Jhn1tSephVFeAaT kpijvrcyEPPTfUnqvK9+pB/lEWtCHU+ZoqkmhNvXiqcFoZ2NX5hSSmQY1Oo0oUP2BE+ylY d8r7qHPrajUe7J3DKtFzFjY95BsJXTLQD2hqY+96+q/HwRttYcl12cJe4+vSgjT6JvjVAy GHBTkoI7r1WvfNSiEqdXvR6mczS3oomIlbUOuFPUu0ymAzeZ/gL9RvSI6/zcrfvtYfptJq f1Tl7PXyeGQjiV4hmY6SKwXV8f3mXA7h5gLvhmdxvnWlWb3HWidAw1OfJzHpQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KrMULZhJRsoG/TtwANPHyR42QbPIXMpTJuzoMHAiuY=; b=hLG1B0YKBbf1BGH1hV74TwfvhwhZaySeYe8IFh936WEo3OEqw9PTjD4QLjTYvysWMgqnRS ahhIbozvbYsJC3cWqTRgk5Ru4i92QeVDbV6AShROi8z5uqkhGHnLNMdrW4oWjhO8beBsmO s/ry2RPfQ+ftJWW2XzBT9dFweU3nRtqxXEHOVYhOttAhRZmAD7dPe4/u00Au43jntbUoaK ZmIy8HgZAH7TfxW/szb3DLOuStB0XYQnUolUWLflqRyHW6akCcNGaqjrroUrwp/HpDaGrs eSVvfL4J37aD0EIp6QfQmj4J59UHfuM4QZOA8LDvaXNP3DJGhfxf5Ypu+Uv0hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705916463; a=rsa-sha256; cv=none; b=wjCQxGt/nk8IDxEYeRSZzwNufozgmtzq+W80nduF5AtmdsmcmVpezZz/2Yli30jXgbrnxI uweWO43R10g/5u/C+c6TzbD7uUpk6ebd8oq6wD8qaceDKwD0j4d/okzyxr+gh0wMIrR9lZ qBvV2S3BJGcmoj/+cv1LRNC9qXOTN8SdAsxIfGt44UGswftxgp562/9gY4Up/nyoXnBjCG E150YkwC/uwztRrq/YekwSVHLnfad+0I/MnYB0HZ0iUwqhwXTLfP1V/g27wgVTACD9xv23 vLWhOsVMf6lt9MP1XkvIf8WTpT5tytGbh60PcGnYtwjZx5HybdgSY7MzgkJw3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJQFq1pczzwXn; Mon, 22 Jan 2024 09:41: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 40M9f31G019746; Mon, 22 Jan 2024 09:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M9f3k1019743; Mon, 22 Jan 2024 09:41:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 09:41:03 GMT Message-Id: <202401220941.40M9f3k1019743@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: d99a15bf6f1c - stable/13 - pci_vendors: update to 2023-11-11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d99a15bf6f1c46e49d93aa8ad4e28dfaf3791c3a Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d99a15bf6f1c46e49d93aa8ad4e28dfaf3791c3a commit d99a15bf6f1c46e49d93aa8ad4e28dfaf3791c3a Author: Baptiste Daroussin AuthorDate: 2023-12-04 10:51:59 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-22 09:40:56 +0000 pci_vendors: update to 2023-11-11 (cherry picked from commit 01e286b54190620ceec85ef865a51eb79b5d81c0) --- share/misc/pci_vendors | 580 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 500 insertions(+), 80 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 50115d979327..bad1d0bd066b 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.09.22 -# Date: 2023-09-22 03:15:02 +# Version: 2023.11.11 +# Date: 2023-11-11 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,8 +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 + f1ab P41 Plus NVMe SSD (DRAM-less) [Echo Harbor] + f1ac P44 Pro NVMe SSD [Hollywood Beach] 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -773,6 +773,9 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front + 1028 22cb PERC H365i Front + 1028 22cc PERC H965i Front + 1028 22cd HBA465i Front 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -816,6 +819,8 @@ 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 + 1028 22d2 PERC H975i Front + 1028 22d3 PERC H975i 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 @@ -1055,6 +1060,7 @@ 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 + 1d49 0703 ThinkSystem M.2 RAID B540d-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1201,7 +1207,7 @@ 103c 8b17 ProBook 445 G9/455 G9 [Ryzen 7 Integrated Radeon GPU] 15ff Fenghuang [Zhongshan Subor Z+] 1607 Arden - 1636 Renoir + 1636 Renoir [Radeon RX Vega 6 (Ryzen 4000/5000 Mobile Series)] 1637 Renoir Radeon High Definition Audio Controller 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] 1043 16c2 Radeon Vega 8 @@ -1215,6 +1221,8 @@ 1681 Rembrandt [Radeon 680M] 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s + 1900 Phoenix3 + 1901 Phoenix4 3150 RV380/M24 [Mobility Radeon X600] 103c 0934 nx8220 3151 RV380 GL [FireMV 2400] @@ -3944,6 +3952,7 @@ 1849 5236 RX 6650 XT Challenger D OC 73f0 Navi 33 [Radeon RX 7600M XT] 73ff Navi 23 [Radeon RX 6600/6600 XT/6600M] + 1462 5021 MSI RX 6600XT MECH 2X 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB @@ -3960,6 +3969,7 @@ 7446 Navi 31 USB 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] + 1002 0e3b RX 7900 GRE [XFX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] @@ -4815,6 +4825,7 @@ 1014 04fb PCIe3 x16 20GB Cache 12Gb Quad SAS RAID+ Adapter(580B) 1014 04fc PCIe3 x8 12Gb Quad SAS RAID+ Adapter(580A) 04ed Internal Shared Memory (ISM) virtual PCI device + 0611 4769 Cryptographic Adapter 3022 QLA3022 Network Adapter 4022 QLA3022 Network Adapter ffff MPIC-2 interrupt controller @@ -5281,7 +5292,7 @@ 1646 VanGogh IOMMU 1647 VanGogh PCIe GPP Bridge 1648 VanGogh Internal PCIe GPP Bridge to Bus - 1649 VanGogh PSP/CCP + 1649 Family 19h PSP/CCP 164f Milan IOMMU 1650 Milan Data Fabric; Function 0 1651 Milan Data Fabric; Function 1 @@ -8439,6 +8450,7 @@ 764d PXI-2521 764e PXI-2522 764f PXI-2523 + 7652 PXIe-4080 7654 PXI-2796 7655 PXI-2797 7656 PXI-2798 @@ -8453,7 +8465,14 @@ 76a3 PXIe-6535B 76a4 PXIe-6536B 76a5 PXIe-6537B + 76d8 PXIe-4081 + 76d9 PXIe-4082 + 77a8 PXIe-6375 783e PXI-8368 + 7882 PXIe-6376 + 7883 PXIe-6378 + 799e PXIe-6386 + 799f PXIe-6396 9020 PXI-2501 9030 PXI-2503 9040 PXI-2527 @@ -8748,6 +8767,8 @@ 13e9 0070 Win/TV (Video Section) 036e Bt878 Video Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 + 0000 0004 Euresys PICOLO Pro 3E 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8768,6 +8789,23 @@ 14f1 0002 Bt878 Mediastream Controller PAL BG 14f1 0003 Bt878a Mediastream Controller PAL BG 14f1 0048 Bt878/832 Mediastream Controller + 1805 0101 Euresys PICOLO Tetra + 1805 0102 Euresys PICOLO Tetra + 1805 0103 Euresys PICOLO Tetra + 1805 0104 Euresys PICOLO Tetra + 1805 0105 Euresys PICOLO Tetra + 1805 0106 Euresys PICOLO Tetra + 1805 0107 Euresys PICOLO Tetra + 1805 0108 Euresys PICOLO Tetra + 1805 0201 Euresys PICOLO Tetra-X + 1805 0202 Euresys PICOLO Tetra-X + 1805 0203 Euresys PICOLO Tetra-X + 1805 0204 Euresys PICOLO Tetra-X + 1805 0401 Euresys PICOLO Tymo + 1805 0402 Euresys PICOLO Tymo + 1805 0403 Euresys PICOLO Tymo + 1805 0404 Euresys PICOLO Tymo + 1805 1001 Euresys PICOLO Junior 4 1822 0001 VisionPlus DVB card 1851 1850 FlyVideo'98 - Video 1851 1851 FlyVideo II @@ -8843,6 +8881,8 @@ 1852 1852 FlyVideo'98 (with FM Tuner) 0878 Bt878 Audio Capture 0000 0001 Euresys Picolo PCIe + 0000 0002 Euresys PICOLO Pro 2 (Audio Section) + 0000 0004 Euresys PICOLO Pro 3E (Audio Section) 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 0071 0101 DigiTV PCI @@ -8865,6 +8905,23 @@ 14f1 0002 Bt878 Video Capture (Audio Section) 14f1 0003 Bt878 Video Capture (Audio Section) 14f1 0048 Bt878 Video Capture (Audio Section) + 1805 0101 Euresys PICOLO Tetra (Audio Section) + 1805 0102 Euresys PICOLO Tetra (Audio Section) + 1805 0103 Euresys PICOLO Tetra (Audio Section) + 1805 0104 Euresys PICOLO Tetra (Audio Section) + 1805 0105 Euresys PICOLO Tetra (Audio Section) + 1805 0106 Euresys PICOLO Tetra (Audio Section) + 1805 0107 Euresys PICOLO Tetra (Audio Section) + 1805 0108 Euresys PICOLO Tetra (Audio Section) + 1805 0201 Euresys PICOLO Tetra-X (Audio Section) + 1805 0202 Euresys PICOLO Tetra-X (Audio Section) + 1805 0203 Euresys PICOLO Tetra-X (Audio Section) + 1805 0204 Euresys PICOLO Tetra-X (Audio Section) + 1805 0401 Euresys PICOLO Tymo (Audio Section) + 1805 0402 Euresys PICOLO Tymo (Audio Section) + 1805 0403 Euresys PICOLO Tymo (Audio Section) + 1805 0404 Euresys PICOLO Tymo (Audio Section) + 1805 1001 Euresys PICOLO Junior 4 (Audio Section) 1822 0001 VisionPlus DVB Card 18ac d500 DViCO FusionHDTV5 Lite 270f fc00 Digitop DTT-1000 @@ -8991,6 +9048,10 @@ 1147 VScom 020 2 port parallel adaptor 2000 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge 10b5 9030 ATCOM AE400P Quad E1 PCI card + 2300 Euresys DOMINO Gamma + 2374 Euresys DOMINO Alpha + 2491 Euresys GRABLINK Value + 2493 Euresys GRABLINK Expert 2540 IXXAT CAN-Interface PC-I 04/PCI 2724 Thales PCSM Security Card 3376 Cosateq 4 Port CAN Card @@ -9106,6 +9167,7 @@ e1c5 0006 TA1-PCI4 9036 9036 9050 PCI <-> IOBus Bridge + 103c 10b0 82350 PCI GPIB 10b5 1067 IXXAT CAN i165 10b5 114e Wasco WITIO PCI168extended 10b5 1169 Wasco OPTOIO32standard 32 digital in, 32 digital out @@ -9117,6 +9179,7 @@ 10b5 2905 Alpermann+Velte PCI TS: Time Synchronisation Board 10b5 3196 Goramo PLX200SYN sync serial card 10b5 9050 PCI-I04 PCI Passive PC/CAN Interface + 11a9 5334 PDS4 12fe 0001 CAN-PCI/331 CAN bus controller 1369 8901 PCX11+ PCI 1369 8f01 VX222 @@ -9542,6 +9605,7 @@ 10be Tseng Labs International Co. 10bf Most Inc 10c0 Boca Research Inc. + 9135 iX3D Ultimate Rez 10c1 ICM Co., Ltd. 10c2 Auspex Systems Inc. 10c3 Samsung Semiconductors, Inc. @@ -12778,16 +12842,20 @@ 2331 GH100 [H100 PCIe] 2336 GH100 [H100] 2337 GH100 [H100 SXM5 64GB] + 2338 GH100 [H100 SXM5 96GB] 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] 233d GH100 [H100 96GB] 2342 GH100 [GH200 120GB] 2343 GH100 2345 GH100 [GH200 480GB] + 23b0 GH100 + 23f0 GH100 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] 2460 GA103M [GeForce RTX 3080 Ti Laptop GPU] + 2480 GA104 [Reserved Dev ID A] 2482 GA104 [GeForce RTX 3070 Ti] 2483 GA104 2484 GA104 [GeForce RTX 3070] @@ -12816,6 +12884,7 @@ 24ba GA104GLM [RTX A4500 Laptop GPU] 24bb GA104GLM [RTX A3000 Laptop GPU] 24bf GA104 [GeForce RTX 3070 Engineering Sample] + 24c0 GA104 [Initial Dev ID B] 24c7 GA104 [GeForce RTX 3060 8GB] 24c8 GA104 [GeForce RTX 3070 GDDR6X] 24c9 GA104 [GeForce RTX 3060 Ti GDDR6X] @@ -12843,6 +12912,7 @@ 2571 GA106 [RTX A2000 12GB] 2582 GA107 [GeForce RTX 3050 8GB] 2583 GA107 [GeForce RTX 3050 4GB] + 2584 GA107 [GeForce RTX 3050 6GB] 25a0 GA107M [GeForce RTX 3050 Ti Mobile] 25a2 GA107M [GeForce RTX 3050 Mobile] 25a3 GA107 @@ -12881,6 +12951,7 @@ 26b8 AD102GL [L40G] 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] + 2703 AD103 [GeForce RTX 4080 SUPER] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] @@ -12891,6 +12962,7 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b1 AD104GL [RTX 4500 Ada Generation] 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] @@ -13074,6 +13146,7 @@ 2011 Q-Motion Video Capture/Edit board 4750 S5930 [Matchmaker] 5920 S5920 + 801d Roper Scientific PCI TAXI interface 8043 LANai4.x [Myrinet LANai interface chip] 8062 S5933_PARASTATION 807d S5933 [Matchmaker] @@ -13147,6 +13220,7 @@ 1028 06e6 Latitude 11 5175 2-in-1 1028 09be Latitude 7410 1028 0b10 Precision 3571 + 1028 0c06 Precision 3580 17aa 224f ThinkPad X1 Carbon 5th Gen 5260 RTS5260 PCI Express Card Reader 5261 RTS5261 PCI Express Card Reader @@ -13160,6 +13234,7 @@ 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) + 5772 RTS5772DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -13342,13 +13417,17 @@ 8813 RTL8813AE 802.11ac PCIe Wireless Network Adapter 8821 RTL8821AE 802.11ac PCIe Wireless Network Adapter 8852 RTL8852AE 802.11ax PCIe Wireless Network Adapter + a85a RTL8852AE WiFi 6 802.11ax PCIe Adapter b723 RTL8723BE PCIe Wireless Network Adapter 10ec 8739 Dell Wireless 1801 17aa b736 Z50-75 + b821 RTL8821CE PCIe 802.11ac Wireless Network Controller b822 RTL8822BE 802.11a/b/g/n/ac WiFi adapter 103c 831b Realtek RTL8822BE 802.11ac 2x2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported) 17aa 5124 ThinkPad E595 17aa b023 ThinkPad E595 + b852 RTL8852BE PCIe 802.11ax Wireless Network Controller + b85b RTL8852BE PCIe 802.11ax Wireless Network Controller [1T1R] c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter c822 RTL8822CE 802.11ac PCIe Wireless Network Adapter c82f RTL8822CE 802.11ac PCIe Wireless Network Adapter @@ -13379,6 +13458,8 @@ 500c Alveo U280 XDMA Platform 5020 Alveo U50 XMDA Platform 505c Alveo U55C + 5074 Alveo X3522, Quad Port, 10/25GbE Adaptable Accelerator Card + 5084 Alveo X3522, Quad Port, 10/25GbE Low Latency Network Adapter 6987 SmartSSD 6988 SmartSSD 7011 7-Series FPGA Hard PCIe block (AXI/debug) @@ -15366,7 +15447,7 @@ 1179 0021 KIOXIA CD5 series SSD 1d49 4039 Thinksystem U.2 CM5 NVMe SSD 1d49 403a Thinksystem AIC CM5 NVMe SSD - 0113 BG3 NVMe SSD Controller + 0113 BG3 x2 NVMe SSD Controller (DRAM-less) 1179 0001 Toshiba KBG30ZMS128G 128GB NVMe SSD 0115 XG4 NVMe SSD Controller 0116 XG5 NVMe SSD Controller @@ -15686,6 +15767,8 @@ 000b ATP867-B 000d ATP8620 000e ATP8620 + 0011 ATP865-B + 1191 0011 ACARD AEC-6280 8002 AEC6710 SCSI-2 Host Adapter 8010 AEC6712UW SCSI 8020 AEC6712U SCSI @@ -15949,7 +16032,7 @@ 6281 88F6281 [Kirkwood] ARM SoC # This device ID was used for earlier chips. 6381 MV78xx0 [Discovery Innovation] ARM SoC - 6440 88SE6440 SAS/SATA PCIe controller + 6440 88SE63x0 x1, 88SE6440 x4 PCIe SAS/SATA 3Gb/s RAID controller 6450 64560 System Controller 6460 MV64360/64361/64362 System Controller 6480 MV64460/64461/64462 System Controller @@ -15960,7 +16043,7 @@ 6820 88F6820 [Armada 385] ARM SoC 6828 88F6828 [Armada 388] ARM SoC 6920 88F6920 [Armada 390] ARM SoC - 7042 88SX7042 PCI-e 4-port SATA-II + 7042 88SX7042 PCIe 4-port SATA-II controller 16b8 434b Tempo SATA E4P 7810 MV78100 [Discovery Innovation] ARM SoC 7820 MV78200 [Discovery Innovation] ARM SoC @@ -16426,9 +16509,9 @@ 13f7 1394 OHCI Compliant Host Controller 6729 OZ6729 673a OZ6730 - 6832 OZ6832/6833 CardBus Controller - 6836 OZ6836/6860 CardBus Controller - 6872 OZ6812 CardBus Controller + 6832 OZ6832/6833 CardBus Controller [Saturn] + 6836 OZ6836/6860 CardBus Controller [Mercury] + 6872 OZ6812 CardBus Controller [Challenger] 6925 OZ6922 CardBus Controller 6933 OZ6933/711E1 CardBus/SmartCardBus Controller 1025 1016 Travelmate 612 TX @@ -16602,6 +16685,7 @@ 00a3 VisionLink F4 00a9 VisionLink CLS 00ab PCIe8g3 A5 10G + 00b5 PCIe8 RFx SDR 123e Simutech, Inc. # nee C-Cube Microsystems / acquired by Magnum Semiconductor 123f LSI Logic @@ -16834,6 +16918,8 @@ 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers + 2269 SM2269XT (DRAM-less) NVMe SSD Controller + 8366 SM8366 NVMe SSD Controller [MonTitan] 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17461,11 +17547,18 @@ 0035 PCI-DAS64/M1/16 0036 PCI-DAS64/M2/16 0037 PCI-DAS64/M3/16 + 004b PCI-MDB64 004c PCI-DAS1000 004d PCI-QUAD04 0052 PCI-DAS4020/12 0053 PCIM-DDA06/16 0054 PCI-DIO96 + 0055 CPCI-DIO24H + 0056 PCIM-DAS1602/16 + 0057 PCI-DAS3202/16 + 0059 PCI-QUAD-AC5 + 005a CPCI-DIO96H + 005b CPCI-DIO48H 005d PCI-DAS6023 005e PCI-DAS6025 005f PCI-DAS6030 @@ -17478,10 +17571,23 @@ 0066 PCI-DAS6052 0067 PCI-DAS6070 0068 PCI-DAS6071 + 006e PCI-CTR10 006f PCI-DAS6036 0070 PCI-DAC6702 + 0071 PCI-DAC6703 + 0074 PCI-CTR20HD + 0077 PCI-DIO24/LP 0078 PCI-DAS6013 0079 PCI-DAS6014 + 007b PCIM-DAS16JR/16 + 007e PCI-DIO24/S + 00a5 PCI-2511 + 00a6 PCI-2513 + 00a7 PCI-2515 + 00a8 PCI-2517 + 00be PCI-QUAD05 + 00da PCIe-DIO96H + 00db PCIe-DIO24 0115 PCIe-DAS1602/16 1308 Jato Technologies Inc. 0001 NetCelerator Adapter @@ -17643,6 +17749,9 @@ 1344 4000 3.2TB U.2 1344 5000 6.4 TB U.2 1344 6000 12.8TB U.2 + 51b7 7500 PRO NVMe SSD + 51b8 7500 MAX NVMe SSD + 51b9 6500 ION NVMe SSD 51c0 7400 PRO NVMe SSD 1028 2162 EC NVMe OPAL 7400 RI M.2 480GB 1028 2163 EC NVMe OPAL 7400 RI M.2 960GB @@ -17689,6 +17798,7 @@ 5411 2450 NVMe SSD [HendrixV] (DRAM-less) 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD + 5416 2550 NVMe SSD (DRAM-less) 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc 1347 Odetics @@ -17727,8 +17837,97 @@ 1355 Kratos Analytical Ltd 1356 The Logical Co 1359 Prisa Networks -135a Brain Boxes - 0a61 UC-324 [VELOCITY RS422/485] +135a Brainboxes Ltd + 0841 UC-268 4 port RS-232 card + 0861 UC-257 2 port RS-232 + LPT card + 0862 UC-257 2 port RS-232 + LPT card + 0863 UC-257 2 port RS-232 + LPT card + 0881 UC-279 8 port RS-232 card + 08a1 UC-313 2 port RS-422/485 card + 08a2 UC-313 2 port RS-422/485 card + 08a3 UC-313 2 port RS-422/485 card + 08c1 UC-310 2 port RS-422/485 Opto Isolated card + 08e1 UC-302 2 port RS-232 card + 08e2 UC-302 2 port RS-232 card + 08e3 UC-302 2 port RS-232 card + 0901 UC-431 3 port RS-232 card + 0921 UC-420 3 + 1 port RS-232 card + 0981 UC-475 1 + 1 port RS-232 + LPT card + 0982 UC-475 1 + 1 port RS-232 + LPT card + 09a1 UC-607 2 port RS-232 card + 09a2 UC-607 2 port RS-232 card + 09a3 UC-607 2 port RS-232 card + 0a61 UC-324 1 port RS-422/485 card + 0a81 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a82 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0a83 UC-357 1 port RS-232 + 1 port RS-422/485 card + 0aa1 UC-246 1 port RS-232 card + 0aa2 UC-246 1 port RS-232 card + 0ac1 UP-189 Powered 2 port RS-232 card + 0ac2 UP-189 Powered 2 port RS-232 card + 0ac3 UP-189 Powered 2 port RS-232 card + 0b01 UC-346 4 port RS-422/485 card + 0b02 UC-346 4 port RS-422/485 card + 0b21 UP-200 Powered 2 port RS-232 card + 0b22 UP-200 Powered 2 port RS-232 card + 0b23 UP-200 Powered 2 port RS-232 card + 0ba1 UC-101 1 + 1 port RS-232 card + 0bc1 UC-203 1 + 1 port RS-232 + LPT card + 0bc2 UC-203 1 + 1 port RS-232 + LPT card + 0be1 UC-146 LPT card + 0be2 UC-146 LPT card + 0c01 UP-869 Powered 2 port RS-232 card + 0c02 UP-869 Powered 2 port RS-232 card + 0c03 UP-869 Powered 2 port RS-232 card + 0c21 UP-880 Powered 2 port RS-232 card + 0c22 UP-880 Powered 2 port RS-232 card + 0c23 UP-880 Powered 2 port RS-232 card + 0c41 UC-368 4 port RS-422/485 Opto Isolated card + 0ca1 UC-253 2 port RS-232 card + 0d21 UC-260 4 port RS-232 card + 0d41 UC-836 4 port RS-232 card + 0d60 IS-100 1 port RS-232 card + 0d80 IS-200 2 port RS-232 card + 0da0 IS-300 1 port RS-232 + LPT card + 0dc0 IS-400 4 port RS-232 card + 0de0 IS-500 LPT card + 0e41 PX-279 8 port RS-232 card + 0e61 UC-414 3 + 1 port RS-232 + LPT card + 4000 PX-420 3 + 1 port RS-232 card + 4001 PX-431 3 port RS-232 card + 4002 PX-820 Powered 3 + 1 port RS-232 card + 4003 PX-831 Powered 3 port RS-232 card + 4004 PX-235 1 port RS-232 card + 4005 PX-101 1 + 1 port RS-232 card + 4006 PX-257 1 + 1 port RS-232 + LPT card (Serial port) + 4007 PX-257 1 + 1 port RS-232 + LPT card (LPT port) + 4008 PX-835 Powered 1 port RS-232 card + 4009 PX-857 Powered 2 port RS-232 card + 400a PX-260 4 port RS-232 card + 400b PX-320 1 port RS-422/485 card + 400c PX-313 2 port RS-422/485 card + 400e PX-310 2 port RS-422/485 Opto Isolated card + 400f PX-346 4 port RS-422/485 card + 4010 PX-368 4 port RS-422/485 Opto Isolated card + 4011 PX-420 3 + 1 port RS-232 card + 4012 PX-431 3 port RS-232 card + 4013 PX-820 Powered 3 + 1 port RS-232 card + 4014 PX-831 Powered 3 port RS-232 card + 4015 PX-257 2 port RS-232 card + 4016 PX-235 1 port RS-232 card + 4017 PX-835 Powered 1 port RS-232 card + 4018 PX-857 Powered 2 port RS-232 card + 4019 PX-101 1 + 1 port RS-232 card + 401c PX-146 LPT card + 401d PX-475 1 port RS-232 + LPT card (Serial port) + 401e PX-803 Powered 1 + 1 port RS-232 card + 401f PX-475 1 port RS-232 + LPT card (LPT port) + 4027 IX-100 1 port RS-232 card + 4028 IX-200 2 port RS-232 card + 4029 IX-400 4 port RS-232 card + 402a IX-500 LPT card + 402c PX-263 4 port RS-232 + LPT card + 4100 PX-272 4 + 1 port RS-232 + LPT card 135b Giganet Inc 135c Quatech Inc 0010 QSC-100 @@ -17738,12 +17937,19 @@ 0050 ESC-100D 0060 ESC-100M 00f0 MPAC-100 Synchronous Serial Card (Zilog 85230) + 0120 QSCP-100 + 0130 DSCP-100 + 0140 QSCP-200/300 + 0150 DSCP-200/300 0170 QSCLP-100 0180 DSCLP-100 + 0181 DSC-100 0190 SSCLP-100 01a0 QSCLP-200/300 01b0 DSCLP-200/300 + 01b1 DSC-200/300 01c0 SSCLP-200/300 + 01e0 ESC(LP)-100 0258 DSPSX-200/300 135d ABB Network Partner AB 135e Sealevel Systems Inc @@ -18233,6 +18439,7 @@ 13fc Computer Peripherals International 13fd Micro Science Inc 13fe Advantech Co. Ltd + 0071 PCIE-1761H, 8-ch Relay and 8-ch Isolated Digital Input Card 1240 PCI-1240 4-channel stepper motor controller card 1600 PCI-16xx series PCI multiport serial board (function 0) # This board has two PCI functions, appears as two PCI devices @@ -19391,9 +19598,9 @@ 144d a801 SM963 2.5" NVMe PCIe SSD a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 - 144d a801 SSD 970 EVO + 144d a801 SSD 970 EVO/PRO 1d49 403b Thinksystem U.2 PM983 NVMe SSD - a809 NVMe SSD Controller 980 + a809 NVMe SSD Controller 980 (DRAM-less) a80a NVMe SSD Controller PM9A1/PM9A3/980PRO 0128 215a DC NVMe PM9A3 RI U.2 960GB 0128 215b DC NVMe PM9A3 RI U.2 1.92TB @@ -19413,9 +19620,12 @@ 1028 2276 DC NVMe PM9A3 RI 110M.2 960GB 1028 2277 DC NVMe PM9A3 RI 110M.2 1.92TB 1028 512d DC NVMe PM9A3 RI U.2 7.68TB + 144d a801 SSD 980 PRO 144d a813 General DC NVMe PM9A3 - a80b NVMe SSD Controller PM9B1 +# Actually 88SS1322 according to techpowerup + a80b NVMe SSD Controller PM9B1 (DRAM-less) a80c NVMe SSD Controller S4LV008[Pascal] + a80d NVMe SSD Controller PM9C1a a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -19658,9 +19868,18 @@ 14a2 Millennium Engineering Inc 14a3 Maverick Networks 14a4 Lite-On Technology Corporation + 2100 CA1-8D128 NVMe SSD + 2200 CX2-8B256, CX2-8B512 NVMe SSD + 22a0 EP2-KB960 NVMe SSD 22f1 M8Pe Series NVMe SSD + 2300 CA3-8D256, CA3-8D512 NVMe SSD + 23f1 M9PeG, M9PeGN, M9PeY NVMe SSD + 2f00 CAZ-82512 NVMe SSD + 3500 CA5-8D512 NVMe SSD # Wrong vendor ID used 4318 Broadcom BCM4318 [AirForce One 54g] 802.11g WLAN Controller + 5100 CB1-SD256, CB1-SD512 NVMe SSD + 9100 CL1-3D256, CL1-8D512 NVMe SSD (DRAM-less) 14a5 XIONICS Document Technologies Inc 14a6 INOVA Computers GmBH & Co KG 14a7 MYTHOS Systems Inc @@ -19729,12 +19948,14 @@ 7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter 7615 MT7615E 802.11ac PCI Express Wireless Network Adapter 7630 MT7630e 802.11bgn Wireless Network Adapter + 7650 MT7650 802.11ac # 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 + 1a3b 5300 ASUS PCE-AXE59BT 7961 MT7921 802.11ax PCI Express Wireless Network Adapter 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB @@ -19980,8 +20201,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 + 14e4 d166 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d366 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20542,16 +20763,16 @@ 4360 BCM4360 802.11ac Wireless Network Adapter 4365 BCM43142 802.11b/g/n 1028 0016 Wireless 1704 802.11n + BT 4.0 - 43a0 BCM4360 802.11ac Wireless Network Adapter - 43a1 BCM4360 802.11ac Wireless Network Adapter - 43a2 BCM4360 802.11ac Wireless Network Adapter + 43a0 BCM4360 802.11ac Dual Band Wireless Network Adapter + 43a1 BCM4360 802.11ac 2,4G Wireless Network Adapter + 43a2 BCM4360 802.11ac 5G Wireless Network Adapter 43a3 BCM4350 802.11ac Wireless Network Adapter # Manufactured by Foxconn for Lenovo 17aa 075a 00JT494 43a9 BCM43217 802.11b/g/n 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter - 43b1 BCM4352 802.11ac Wireless Network Adapter + 43b1 BCM4352 802.11ac Dual Band 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 @@ -20577,12 +20798,14 @@ 441f BCM4361 802.11ac Dual-Band Wireless Network Controller 4420 BCM4361 802.11ac 2.4 GHz Wireless Network Controller 4421 BCM4361 802.11ac 5 GHz Wireless Network Controller - 4425 BRCM4378 Wireless Network Adapter + 4425 BCM4378 802.11ax Dual Band Wireless Network Adapter 4430 BCM44xx CardBus iLine32 HomePNA 2.0 4432 BCM4432 CardBus 10/100BaseT + 4433 BCM4387 802.11ax Dual Band Wireless LAN Controller 4464 BCM4364 802.11ac Wireless Network Adapter # brcmfmac reports it as BCM4377/4 but macOS drivers call it BCM4377b 4488 BCM4377b Wireless Network Adapter + 449d BCM43752 802.11ax Dual Band Wireless LAN Controller 4610 BCM4610 Sentry5 PCI to SB Bridge 4611 BCM4610 Sentry5 iLine32 HomePNA 1.0 4612 BCM4610 Sentry5 V.90 56k Modem @@ -20900,6 +21123,10 @@ 17de 08a6 KWorld/VStream XPert DVB-T 17de 08b2 KWorld DVB-S 100 17de a8a6 digitalnow DNTV Live! DVB-T + 1805 0111 PICOLO Jet-X Video + 1805 0112 PICOLO Jet-X Video + 1805 0113 PICOLO Jet-X Video + 1805 0114 PICOLO Jet-X Video 1822 0025 digitalnow DNTV Live! DVB-T Pro 185b e000 VideoMate X500 18ac d500 FusionHDTV 5 Gold @@ -20928,6 +21155,10 @@ 14f1 0187 Conexant DVB-T reference design 17de 08a1 XPert DVB-T PCI BDA DVBT 23880 Transport Stream Capture 17de 08a6 KWorld/VStream XPert DVB-T + 1805 0111 PICOLO Jet-X Jpeg + 1805 0112 PICOLO Jet-X Jpeg + 1805 0113 PICOLO Jet-X Jpeg + 1805 0114 PICOLO Jet-X Jpeg 18ac d500 DViCO FusionHDTV5 Gold 18ac d810 DViCO FusionHDTV3 Gold-Q 18ac d820 DViCO FusionHDTV3 Gold-T @@ -20940,6 +21171,10 @@ 0070 6902 WinTV HVR-4000-HD 0070 9002 Nova-T DVB-T Model 909 0070 9402 WinTV-HVR1100 DVB-T/Hybrid + 1805 0111 PICOLO Jet-X Control + 1805 0112 PICOLO Jet-X Control + 1805 0113 PICOLO Jet-X Control + 1805 0114 PICOLO Jet-X Control 7063 5500 pcHDTV HD-5500 8811 CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port] 0070 3400 WinTV 34604 @@ -21283,6 +21518,8 @@ 0001 Eagle Cluster Manager 0002 Osprey Cluster Manager 0003 Harrier Cluster Manager + 0371 Cassini 2 [Slingshot 400Gb] + 0372 Cassini 2 [Slingshot 400Gb] SR-IOV VF a01d FC044X Fibre Channel HBA 1591 ARN 1592 Syba Tech Ltd @@ -21627,10 +21864,10 @@ 2001 Skyhawk Series NVME SSD 5001 WD Black 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 / Red SN700 NVMe SSD + 5003 WD Blue SN500 / PC SN520 x2 M.2 2280 NVMe SSD + 5004 PC SN520 x2 M.2 2230 NVMe SSD + 5005 PC SN520 x2 M.2 2242 NVMe SSD + 5006 SanDisk Extreme Pro / WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD @@ -21639,17 +21876,18 @@ 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5014 WD PC SN540 / 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 + 5019 WD Green SN350 240GB (DRAM-less) / SN560E NVMe SSD + 501a SanDisk Ultra 3D / WD Blue SN570 NVMe SSD (DRAM-less) 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) + 5028 WD CH SN560 NVMe SSD 5030 WD Black SN850X NVMe SSD 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH @@ -21673,7 +21911,11 @@ 117c 0022 Celerity FC-42XS Fibre Channel Adapter 117c 0025 Celerity FC-44ES Fibre Channel Adapter 117c 0026 Celerity FC-42ES Fibre Channel Adapter + 0b01 82350B PCI GPIB 1100 E8001-66442 PCI Express CIC + 1218 82351A PCI Express GPIB + 12d6 82350C PCI GPIB + 12d7 82351B PCI Express GPIB 2922 64 Bit, 133MHz PCI-X Exerciser & Protocol Checker 2928 64 Bit, 66MHz PCI Exerciser & Analyzer 2929 64 Bit, 133MHz PCI-X Analyzer & Exerciser @@ -21927,6 +22169,11 @@ 165f Linux Media Labs, LLC 1020 LMLM4 MPEG-4 encoder 1661 Worldspace Corp. +1665 EDAX Inc +# P/N 4035.006.19720 + 1973 DPP-II FR2 Board +# P/N 4035.065.20000 + 2000 SG-IIP Board 1668 Actiontec Electronics Inc 0100 Mini-PCI bridge # Formerly SiByte, Inc. @@ -22861,6 +23108,7 @@ 17d5 7831 X3120 Dual Port 10GBase-CR 17db Cray Inc 0101 XT Series [Seastar] 3D Toroidal Router + 0501 Cassini 1 [Slingshot 200Gb] 17de KWorld Computer Co. Ltd. 17df Dini Group 1864 Virtex4 PCI Board w/ QL5064 Bridge [DN7000K10PCI/DN8000K10PCI/DN8000K10PSX/NOTUS] @@ -22978,6 +23226,35 @@ 1804 Ralink corp. (wrong ID) 3060 RT3060 Wireless 802.11n 1T/1R 1805 Euresys S.A. + 0201 PICOLO Alert PCI + 0202 PICOLO Diligent + 0204 PICOLO Alert-RC + 0205 PICOLO Alert PCIe + 0206 PICOLO Diligent Plus PCIe + 0207 PICOLO Alert-RC PCIe + 0300 GRABLINK Expert 2 + 0301 GRABLINK Quickpack ColorScan + 0302 GRABLINK Value cPCI + 0303 GRABLINK Expert 2 cPCI + 0305 GRABLINK Avenue + 0306 GRABLINK Quickpack CFA + 0307 GRABLINK Express + 0308 GRABLINK Quickpack CFA PCIe + 0309 GRABLINK Quickpack CFA PCIe (Recovery) + 030a GRABLINK Full + 030b GRABLINK Full (Recovery) + 030c GRABLINK DualBase + 030d GRABLINK DualBase (Recovery) + 030e GRABLINK Base + 030f GRABLINK Base (Recovery) + 0310 GRABLINK Full XR + 0311 GRABLINK Full XR (Recovery) + 0401 DOMINO Iota + 0402 DOMINO Alpha 2 + 0403 DOMINO Harmony + 0404 DOMINO Melody + 0407 DOMINO Symphony + 0408 DOMINO Symphony PCIe 1809 Lumanate, Inc. 180c IEI Integration Corp 1813 Ambient Technologies Inc @@ -23710,11 +23987,13 @@ 5007 E7 NVMe Controller 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller - 5013 PS5013 E13 NVMe Controller + 5013 PS5013-E13 PCIe3 NVMe Controller (DRAM-less) + 5015 PS5015-E15 PCIe3 NVMe Controller (DRAM-less) 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) + 5026 PS5026-E26 PCIe5 NVMe Controller 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile @@ -24246,6 +24525,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0011 QEMU PVPanic device 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine @@ -24291,6 +24571,7 @@ 1028 2151 BOSS-N1 Modular ET 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter + 1b96 4000 WD_BLACK AN1500 NVMe SSD 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 @@ -24380,6 +24661,12 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 2700 Ultrastar DC SN650 NVMe SSD + 2701 Ultrastar DC SN650 NVMe SSD + 2702 Ultrastar DC SN650 NVMe SSD + 2720 Ultrastar DC SN650 NVMe SSD + 2721 Ultrastar DC SN650 NVMe SSD + 2722 Ultrastar DC SN655 NVMe SSD 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD @@ -24500,6 +24787,10 @@ 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD +# 2TB + 5021 FireCuda 520 SSD +# 1TB + 5026 FireCuda 540 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder 4309 BC-08240A MPEG4 4 port video encoder / decoder @@ -24559,6 +24850,7 @@ 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH + 0002 CAN-IB100/PCIe 0003 CAN-IB200/PCIe 1bef Lantiq 0011 MIPS SoC PCI Express Port @@ -24566,6 +24858,7 @@ 0001 SentinelEX 7011 RX0xxx 1bf5 Greenliant + 1000 G7200 series U.2 NVMe SSD 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24699,6 +24992,8 @@ 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive 284a PE8110 Series NVMe Solid State Drive 2a49 PE9110 Series NVMe Solid State Drive + 2a59 PE9010 Series NVMe Solid State Drives + 2b59 PS10x0 Series NVMe Solid State Drives 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24721,11 +25016,18 @@ 1c5f 0b40 NVMe SSD PBlaze6 6530 7680G AIC 1c5f 0b41 NVMe SSD PBlaze6 6530 7680G 2.5" U.2 1c5f 0b47 NVMe SSD PBlaze6 6630 7680G 2.5" U.2 + 1c5f 1320 NVMe SSD PBlaze6 6531 1920G AIC 1c5f 1321 NVMe SSD PBlaze6 6531 1920G 2.5" U.2 + 1c5f 1330 NVMe SSD PBlaze6 6531 3840G AIC 1c5f 1331 NVMe SSD PBlaze6 6531 3840G 2.5" U.2 + 1c5f 1340 NVMe SSD PBlaze6 6531 7680G AIC 1c5f 1341 NVMe SSD PBlaze6 6531 7680G 2.5" U.2 + 1c5f 1421 NVMe SSD PBlaze6 6541 1920G 2.5" U.2 + 1c5f 1427 NVMe SSD PBlaze6 6641 1920G 2.5" U.2(dual port) 1c5f 1431 NVMe SSD PBlaze6 6541 3840G 2.5" U.2 + 1c5f 1437 NVMe SSD PBlaze6 6641 3840G 2.5" U.2(dual port) 1c5f 1441 NVMe SSD PBlaze6 6541 7680G 2.5" U.2 + 1c5f 1447 NVMe SSD PBlaze6 6641 7680G 2.5" U.2(dual port) 1c5f 4b20 NVMe SSD PBlaze6 6536 1600G AIC 1c5f 4b21 NVMe SSD PBlaze6 6536 1600G 2.5" U.2 1c5f 4b25 NVMe SSD PBlaze6 6536 1600G E1.S @@ -24737,11 +25039,18 @@ 1c5f 4b40 NVMe SSD PBlaze6 6536 6400G AIC 1c5f 4b41 NVMe SSD PBlaze6 6536 6400G 2.5" U.2 1c5f 4b47 NVMe SSD PBlaze6 6636 6400G 2.5" U.2 + 1c5f 5320 NVMe SSD PBlaze6 6537 1600G AIC 1c5f 5321 NVMe SSD PBlaze6 6537 1600G 2.5" U.2 + 1c5f 5330 NVMe SSD PBlaze6 6537 3200G AIC 1c5f 5331 NVMe SSD PBlaze6 6537 3200G 2.5" U.2 + 1c5f 5340 NVMe SSD PBlaze6 6537 6400G AIC 1c5f 5341 NVMe SSD PBlaze6 6537 6400G 2.5" U.2 + 1c5f 5421 NVMe SSD PBlaze6 6547 1600G 2.5" U.2 + 1c5f 5427 NVMe SSD PBlaze6 6647 1600G 2.5" U.2(dual port) 1c5f 5431 NVMe SSD PBlaze6 6547 3200G 2.5" U.2 + 1c5f 5437 NVMe SSD PBlaze6 6647 3200G 2.5" U.2(dual port) 1c5f 5441 NVMe SSD PBlaze6 6547 6400G 2.5" U.2 + 1c5f 5447 NVMe SSD PBlaze6 6647 6400G 2.5" U.2(dual port) 003d PBlaze5 920/926 1c5f 0a30 NVMe SSD PBlaze5 920 3840G AIC 1c5f 0a31 NVMe SSD PBlaze5 920 3840G 2.5" U.2 @@ -24764,11 +25073,28 @@ 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 0431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c31 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 0c41 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 0c51 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 1430 NVMe SSD PBlaze7 7940 3840G AIC *** 479 LINES SKIPPED *** From nobody Mon Jan 22 09:46:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJQMb3dKMz57Xdl; Mon, 22 Jan 2024 09:46: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 4TJQMb2xl0z4Pg5; Mon, 22 Jan 2024 09:46:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJ7ldwSSvGZcBIl/add3Sl20Vj/dOSKIhH/VIhynXrQ=; b=heKhmyuOvSlOTKG/i8OBjZ/0bNCjDT85pnt4jzI1jDQhpYV3V6RcA/AHtg5tq6TMrWxz19 /LX6w4EsJiOS/CKrlemdgKF8F8w6l5YGvfxPDQVde+06i8DSDG7XbcnMtBhq4XoU7xRm8G mWeltKM+ssPOt/k4pM/9cgbcXbNnwly/VCI/Xe2U99pzyabBgS4LNmyhWqmpK0ZgWzfPxW l+0GeG23m+QK0uIW6cuEtEksOb1l7i3pjrWIo1sBGlcHEAFm21/5oiXkwcHNXVJvrRg6M4 Vuyi0hGDugfaYqjk0WjBMszJp93HZQLiW3fvwVfagY35sRTb1gmEeZA0O830Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705916763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJ7ldwSSvGZcBIl/add3Sl20Vj/dOSKIhH/VIhynXrQ=; b=BqKKmUmu9xMfx+wRR3jUyPgcNgZvsN+g9mrelncIQUgFfaAig3ucLHN1auESrp6bFuB/Xi rBNYDGVrIe+f1wB+qZVIkABzwcnoNZOvZYCOfSiTOmbygXQwcg1gY6yTkAQXa8be30q0Od 6EMMtEytvqoNiRKHZ1ny2zoNKMLwG/DWAcxNSxXqbkZb3TV0c/bOMlPQDWsuGIVMSJvTZL Q8JgYs3gzYLgMfaGLKgm0BlY3YTaH5JD6rMyiO6MpBeDLDXBVaoEOGJWxMXAxKdfo406JA 1O3hiAcXsjNQjeeZ7nirFXHuN7Guw2hIRUMXVT2cEXwHN2WDtFOWiygwGn0XoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705916763; a=rsa-sha256; cv=none; b=xvsOyoucil+BzZXMx/69Q5Oq0YOzamW8S0kFgCdB8g7lEV/LYIoZdkuauzgAtssokoiiUa 0PfhavaDGf2fUwWB5ZhBd0xNWvCVSzSrd8x4XBe4NEfJ15/AqsbLUIMIdNl89VYlhXIYQU o766H24hfvEJQbAy8G5DOolxDf5cNQtK3UFUmBmbOCsue6DthrNJWg20kilwPvmXuRESv+ Bd5ydheV1UexF0Hk8utEdAR+caAAGn2sd3E53krLNmbgg1SUt7Ni7e2yjtvV6BphMl53wD Dwmx7251vha+uRoAjG4vKDUqHN+6+B/Z+QJjh1ynCOPWuQa1BQzsfs6Ry1G6Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJQMb20DgzxMf; Mon, 22 Jan 2024 09:46: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 40M9k3Ts027018; Mon, 22 Jan 2024 09:46:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M9k3kf027015; Mon, 22 Jan 2024 09:46:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 09:46:03 GMT Message-Id: <202401220946.40M9k3kf027015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: f7d3d0a4ded3 - main - sound: use device_set_descf() to set device descriptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7d3d0a4ded35ba15d63cdf9287b4a2d6f80da11 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f7d3d0a4ded35ba15d63cdf9287b4a2d6f80da11 commit f7d3d0a4ded35ba15d63cdf9287b4a2d6f80da11 Author: Christos Margiolis AuthorDate: 2024-01-22 09:44:51 +0000 Commit: Christos Margiolis CommitDate: 2024-01-22 09:44:51 +0000 sound: use device_set_descf() to set device descriptions Commit 6b6914c1e21b introduced a printf-like version of device_set_desc(), so use it to simplify device description setting in the audio stack. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D43467 --- sys/dev/sound/pci/emu10kx-pcm.c | 4 +--- sys/dev/sound/pci/emu10kx.c | 12 ++---------- sys/dev/sound/pci/hda/hdaa.c | 8 ++------ sys/dev/sound/pci/hda/hdac.c | 6 ++---- sys/dev/sound/pci/hda/hdacc.c | 3 +-- sys/dev/sound/pci/hdspe-pcm.c | 13 +++++-------- sys/dev/sound/usb/uaudio.c | 5 ++--- 7 files changed, 15 insertions(+), 36 deletions(-) diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index b4633efdddc7..825a39fc4e63 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -1298,7 +1298,6 @@ emu_pcm_probe(device_t dev) { uintptr_t func, route; const char *rt; - char buffer[255]; BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_FUNC, &func); @@ -1328,8 +1327,7 @@ emu_pcm_probe(device_t dev) break; } - snprintf(buffer, 255, "EMU10Kx DSP %s PCM interface", rt); - device_set_desc_copy(dev, buffer); + device_set_descf(dev, "EMU10Kx DSP %s PCM interface", rt); return (0); } diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index 29366c3b61f3..6bbbfcc1df0e 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -2985,7 +2985,6 @@ emu_write_ivar(device_t bus __unused, device_t dev __unused, static int emu_pci_probe(device_t dev) { - struct sbuf *s; unsigned int thiscard = 0; uint16_t vendor; @@ -2997,15 +2996,8 @@ emu_pci_probe(device_t dev) if (thiscard == 0) return (ENXIO); - s = sbuf_new(NULL, NULL, 4096, 0); - if (s == NULL) - return (ENOMEM); - sbuf_printf(s, "Creative %s [%s]", emu_cards[thiscard].desc, emu_cards[thiscard].SBcode); - sbuf_finish(s); - - device_set_desc_copy(dev, sbuf_data(s)); - - sbuf_delete(s); + device_set_descf(dev, "Creative %s [%s]", + emu_cards[thiscard].desc, emu_cards[thiscard].SBcode); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index e64eac6114e4..02f4babcd331 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -6577,14 +6577,12 @@ static int hdaa_probe(device_t dev) { const char *pdesc; - char buf[128]; if (hda_get_node_type(dev) != HDA_PARAM_FCT_GRP_TYPE_NODE_TYPE_AUDIO) return (ENXIO); pdesc = device_get_desc(device_get_parent(dev)); - snprintf(buf, sizeof(buf), "%.*s Audio Function Group", + device_set_descf(dev, "%.*s Audio Function Group", (int)(strlen(pdesc) - 10), pdesc); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } @@ -6939,7 +6937,6 @@ hdaa_pcm_probe(device_t dev) struct hdaa_devinfo *devinfo = pdevinfo->devinfo; const char *pdesc; char chans1[8], chans2[8]; - char buf[128]; int loc1, loc2, t1, t2; if (pdevinfo->playas >= 0) @@ -6984,7 +6981,7 @@ hdaa_pcm_probe(device_t dev) if (pdevinfo->digital) t1 = -2; pdesc = device_get_desc(device_get_parent(dev)); - snprintf(buf, sizeof(buf), "%.*s (%s%s%s%s%s%s%s%s%s)", + device_set_descf(dev, "%.*s (%s%s%s%s%s%s%s%s%s)", (int)(strlen(pdesc) - 21), pdesc, loc1 >= 0 ? HDA_LOCS[loc1] : "", loc1 >= 0 ? " " : "", (pdevinfo->digital == 0x7)?"HDMI/DP": @@ -6994,7 +6991,6 @@ hdaa_pcm_probe(device_t dev) chans1[0] ? " " : "", chans1, chans2[0] ? "/" : "", chans2, t1 >= 0 ? " " : "", t1 >= 0 ? HDA_DEVS[t1] : ""); - device_set_desc_copy(dev, buf); return (BUS_PROBE_SPECIFIC); } diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 2cf9239499af..1f06692ba36e 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -1101,10 +1101,8 @@ hdac_probe(device_t dev) snprintf(desc, sizeof(desc), "Generic (0x%08x)", model); result = BUS_PROBE_GENERIC; } - if (result != ENXIO) { - strlcat(desc, " HDA Controller", sizeof(desc)); - device_set_desc_copy(dev, desc); - } + if (result != ENXIO) + device_set_descf(dev, "%s HDA Controller", desc); return (result); } diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index b551b4b37701..f815e39392d4 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -472,8 +472,7 @@ hdacc_probe(device_t dev) hdacc_codecs[i].name, hda_get_device_id(dev)); } else snprintf(buf, sizeof(buf), "Generic (0x%04x)", id); - strlcat(buf, " HDA CODEC", sizeof(buf)); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "%s HDA CODEC", buf); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 0360e84fbe91..db39b867879f 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -1000,23 +1000,20 @@ hdspe_pcm_attach(device_t dev) { char status[SND_STATUSLEN]; struct sc_pcminfo *scp; - char desc[64]; + const char *buf; int err; int play, rec; scp = device_get_ivars(dev); scp->ih = &hdspe_pcm_intr; - bzero(desc, sizeof(desc)); if (scp->hc->ports & HDSPE_CHAN_AIO_ALL) - snprintf(desc, sizeof(desc), "HDSPe AIO [%s]", - scp->hc->descr); + buf = "AIO"; else if (scp->hc->ports & HDSPE_CHAN_RAY_ALL) - snprintf(desc, sizeof(desc), "HDSPe RayDAT [%s]", - scp->hc->descr); + buf = "RayDAT"; else - snprintf(desc, sizeof(desc), "HDSPe ? [%s]", scp->hc->descr); - device_set_desc_copy(dev, desc); + buf = "?"; + device_set_descf(dev, "HDSPe %s [%s]", buf, scp->hc->descr); /* * We don't register interrupt handler with snd_setup_intr diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index ebbff0e633e4..917b6bd3f238 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1171,7 +1171,7 @@ uaudio_attach_sub(device_t dev, kobj_class_t mixer_class, kobj_class_t chan_clas { struct uaudio_softc *sc = device_get_softc(device_get_parent(dev)); unsigned i = uaudio_get_child_index_by_dev(sc, dev); - char status[SND_STATUSLEN], desc[128]; + char status[SND_STATUSLEN]; uaudio_mixer_init(sc, i); @@ -1199,10 +1199,9 @@ uaudio_attach_sub(device_t dev, kobj_class_t mixer_class, kobj_class_t chan_clas mixer_hwvol_init(dev); - snprintf(desc, sizeof(desc), "%s %s", + device_set_descf(dev, "%s %s", usb_get_manufacturer(sc->sc_udev), usb_get_product(sc->sc_udev)); - device_set_desc_copy(dev, desc); snprintf(status, sizeof(status), "on %s", device_get_nameunit(device_get_parent(dev))); From nobody Mon Jan 22 12:52:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJVW74CgZz57rLZ; Mon, 22 Jan 2024 12:52: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 4TJVW73b7Jz3xKL; Mon, 22 Jan 2024 12:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705927971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAzlGSqCQPPcs7iu4eL46NS+GzSPUkZXYHR/NYi9BiQ=; b=wbPemWvoo8bmvEzxnQr/d/7u5ezOzp8ZjaDriBstZydk8Xfq0uWUkRarLW6LxbJczRxSpF daTxJAYAp8xGKcktbxn9y0qBngMa5vX+1l89CXBABcRcqv80UMb8Hwqd9UD3y4CeY6JHsA cjkbTk1NUmU1qzRucTLeU9OsN/rzXlP4fJkn0QZK8JDRyrsDt12ZmOey+I+Lc0Sa+qvD1i KKTWSF4h6QF4+m12CVKmBs6Zo0Bmvyhu3G7mZh8isq0pbPFjMIGmfY+kYYi6OutSdTje6W SWbZMYlwzD/y/yhhgwraA+U55kHGIXu6sTXMGyK0Hwt7f5YnRmaZSWHfjXbcsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705927971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAzlGSqCQPPcs7iu4eL46NS+GzSPUkZXYHR/NYi9BiQ=; b=tB4Rs94Qms5edk7odg2WBHR5+ErS/UyCIAdAeUSHZdBewus2qgKU45tlUIMMRkjf92hDjX NkCRVUN0RSemIU8TLaH0dG1/WStwS3ClgJeDIJMtLLQ6JMfSzTMJ7qsm+5g6X5Jb/AHNvf wJ8I30faYJBz5nUX+vZaCCjiHUvS3hK6CHCGoFgf760agtrWB6ndqLJq4tTyG6qZQShR+/ os7oZVArp9SphUFa3ORgMW+aM9UeQkfhwhzQJ2jLGFwfrvM4SsNezjGJEzs5u8FwA6D5yu 836hqwa0DyV7wyPsQdJ55lL5XKqAC/EtuY4MHTzzEr85h4Scr2zZKMfQx4UhgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705927971; a=rsa-sha256; cv=none; b=wYrmfMc3uzvmfwWghs3p5UgIekzzTPhuTbgmsKvbgnSIA9AzXi3aWAg94+scw0DLRkZMAJ aQolD3hFuQ0foVV6ZTbrcOIYuLyRZxLIB17i/fXK1Wo5WnG4soRC6j214b/q2otGb1YufO DXye0+bQAuE4yb3YkM8gF6qWAWV2LlaRlddgUst/pveZq1kpp8PD43uJQqHXxxiETJAomc KZtavQgUKc4To02PqG5AFfTNdLQj36/9y8qQxMxb+1wanyiGclqpHILsNcJH8aFpb3lJOk xKlC5Fb2EwQIKn/KOikta94BpSHIn/fOU+Xvi0FbZx1Gdybq29Vgtfrs/pEj3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJVW72fLvz12n7; Mon, 22 Jan 2024 12:52: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 40MCqpF2047529; Mon, 22 Jan 2024 12:52:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MCqpf6047526; Mon, 22 Jan 2024 12:52:51 GMT (envelope-from git) Date: Mon, 22 Jan 2024 12:52:51 GMT Message-Id: <202401221252.40MCqpf6047526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 54c62e3e5d8c - main - pf: work around icmp6 packet-too-big not being sent when binat-ing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=54c62e3e5d8cd90c5571a1d4c8c5f062d580480e commit 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e Author: Kristof Provost AuthorDate: 2024-01-17 17:11:27 +0000 Commit: Kristof Provost CommitDate: 2024-01-22 11:52:14 +0000 pf: work around icmp6 packet-too-big not being sent when binat-ing If we're applying NPTv6 we pass a packet with a modified source and/or destination address to the network stack. If that packet then turns out to be larger than the MTU of the sending interface the stack will attempt to generate an icmp6 packet-too-big error, but may fail to look up the appropriate source address for that error message. Even if it does, pf would still have to undo the binat operation inside the icmp6 packet so the sending host can make sense of the error. We can avoid both problems entirely by having pf also perform the MTU check (taking the potential refragmentation into account), and generating the icmp6 error directly in pf. See also: https://redmine.pfsense.org/issues/14290 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D43499 --- sys/net/pfvar.h | 1 + sys/netpfil/pf/pf.c | 12 ++++++++++++ sys/netpfil/pf/pf_norm.c | 15 +++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index f0742c99a4a8..ff3370bc105e 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2297,6 +2297,7 @@ int pf_normalize_ip6(struct mbuf **, struct pfi_kkif *, u_short *, void pf_poolmask(struct pf_addr *, struct pf_addr*, struct pf_addr *, struct pf_addr *, sa_family_t); void pf_addr_inc(struct pf_addr *, sa_family_t); +int pf_max_frag_size(struct mbuf *); int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *, bool); #endif /* INET6 */ diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 9bd9828a99d9..38a5a45d7991 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8510,6 +8510,18 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb return (PF_PASS); } + /* + * If we end up changing IP addresses (e.g. binat) the stack may get + * confused and fail to send the icmp6 packet too big error. Just send + * it here, before we do any NAT. + */ + if (dir == PF_OUT && IN6_LINKMTU(ifp) < pf_max_frag_size(m)) { + PF_RULES_RUNLOCK(); + *m0 = NULL; + icmp6_error(m, ICMP6_PACKET_TOO_BIG, 0, IN6_LINKMTU(ifp)); + return (PF_DROP); + } + memset(&pd, 0, sizeof(pd)); TAILQ_INIT(&pd.sctp_multihome_jobs); if (default_actions != NULL) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index f5d1a66f6467..295377bef3e8 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -939,6 +939,21 @@ fail: #endif /* INET6 */ #ifdef INET6 +int +pf_max_frag_size(struct mbuf *m) +{ + struct m_tag *tag; + struct pf_fragment_tag *ftag; + + tag = m_tag_find(m, PACKET_TAG_PF_REASSEMBLED, NULL); + if (tag == NULL) + return (m->m_pkthdr.len); + + ftag = (struct pf_fragment_tag *)(tag + 1); + + return (ftag->ft_maxlen); +} + int pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag, bool forward) From nobody Mon Jan 22 12:52:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJVW85PdLz57rRc; Mon, 22 Jan 2024 12:52: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 4TJVW84vn7z3xVZ; Mon, 22 Jan 2024 12:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705927972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pyd/joJSxm7NNwGiT0U2AsKYJSessjj0Xs8PqudYmI=; b=RPCnc0mNq4WTUm7JIb1YDE/cpx3DnNlpHG2nFn/nb0BPe9rYLlVAiFtAFEaIFgMMLg8LN+ j1vEglS/mTMMA15rvqhVrSbdPzd8DTp6xJVqzHJDyY0pRlXdxSZbVSUK48/ruzsPoIKG1c 1SOwXqlYmQoh1EbYP8Kh26MyWmS54mtK35iA6KZcKRlmsz6mLu0++QfnG374LoTS9khHD1 t73UH3tyqn9x8tzzumzFEGhDE90k2gHbViOlA4noRWI+YNl1REnsVBJ/QgD+x5zsBXD/ej xzRj3tjDB2tJ8GHCdhCQt9XCaBFE+ipvlKpJ2INI5PCSA4k3NIvlmhognzwtAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705927972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pyd/joJSxm7NNwGiT0U2AsKYJSessjj0Xs8PqudYmI=; b=LgMze+oAs2KDiIC3SLR5XFRa8w1UgvmwLEBKss81dcmtI1XFghN/EPI45LjnGim1lZz3WL S8GpbFCrpUbjPdDOsaiDCGKQg6tno85Wy9o0B9aty1uGhUSgO65r4BGcTrIfIF+m+kVlHd w9FL+BM+QStXA70r4KO7gqissZ2lWGcan9puXzjs7w2+La9pExnBeqYK937YdUaBfjBDtn TWkLdwOjfm0a3PiJVvIQTBqPnzGVyFoz+tyG4+nEAoUW0ld/NGqW7svUIKHSSk9Gs+bv4C s2AoYldUlHriMbv73PGTUa1S9BZL0vGD+sA59OhdmkGM0rIq1hIJNPCrcxYaWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705927972; a=rsa-sha256; cv=none; b=x2fxE8tM4RzzdU1yGE1+GhJ6OiEaM99JHlGTLhSJzq58Zxu1osg94Z8DdgjLSxc4sHEReo d+t1IwGwBiuZ4uVrTtGutq+CnOzLVk5FC0YSjY+wkDI5oL9KRZ4L0Qx1tdNDpDN0adzUOk VMoR0cpVo7dWNA2u1qsREsJdqOSg25D3BbEywb7LWf2tCtc9mlfxRJi3B3ge4JGh76YE1V dcex4IskOHRptHJqtOC2LSJ0CSrHnD7ds16L4A/yP6SUnbevoT+0/Tj51gRQA1gNL5m87C 0XUIPvVOfwWYKXrWc5mmnShLsG80CLYMAFSS4cGyMWVZZglG7nZNQ5HQUII7ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJVW83zzHz12xW; Mon, 22 Jan 2024 12:52: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 40MCqqtr047583; Mon, 22 Jan 2024 12:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MCqq7m047580; Mon, 22 Jan 2024 12:52:52 GMT (envelope-from git) Date: Mon, 22 Jan 2024 12:52:52 GMT Message-Id: <202401221252.40MCqq7m047580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 57c50d6b3673 - main - pf tests: test ICMP6 packet too big with binat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57c50d6b3673225064d9c38cd06a41ec1730d3d1 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=57c50d6b3673225064d9c38cd06a41ec1730d3d1 commit 57c50d6b3673225064d9c38cd06a41ec1730d3d1 Author: Kristof Provost AuthorDate: 2024-01-17 17:03:56 +0000 Commit: Kristof Provost CommitDate: 2024-01-22 12:49:56 +0000 pf tests: test ICMP6 packet too big with binat Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D43500 --- tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/nat66.py | 166 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index f1a2fff5a45d..30099fdc4c17 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -46,6 +46,7 @@ ATF_TESTS_SH+= altq \ tos ATF_TESTS_PYTEST+= frag6.py +ATF_TESTS_PYTEST+= nat66.py ATF_TESTS_PYTEST+= sctp.py # Tests reuse jail names and so cannot run in parallel. diff --git a/tests/sys/netpfil/pf/nat66.py b/tests/sys/netpfil/pf/nat66.py new file mode 100644 index 000000000000..006ab5afee7f --- /dev/null +++ b/tests/sys/netpfil/pf/nat66.py @@ -0,0 +1,166 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 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 ctypes +import ipaddress +import pytest +import re +import socket +import threading +import time +from atf_python.sys.net.tools import ToolsHelper +from atf_python.sys.net.vnet import VnetTestTemplate + +class DelayedSend(threading.Thread): + def __init__(self, packet): + threading.Thread.__init__(self) + self._packet = packet + + self.start() + + def run(self): + import scapy.all as sp + time.sleep(1) + sp.send(self._packet) + +class TestNAT66(VnetTestTemplate): + REQUIRED_MODUES = [ "pf" ] + TOPOLOGY = { + "vnet1": {"ifaces": ["if1"]}, + "vnet2": {"ifaces": ["if1", "if2"]}, + "vnet3": {"ifaces": ["if2"]}, + "if1": {"prefixes6": [("2001:db8::2/64", "2001:db8::1/64")]}, + "if2": {"prefixes6": [("2001:db8:1::1/64", "2001:db8:1::2/64")]}, + } + + def vnet2_handler(self, vnet): + ifname = vnet.iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s mtu 9000" % ifname) + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "set reassemble yes", + "binat inet6 from 2001:db8::/64 to 2001:db8:1::/64 -> 2001:db8:42::/64", + "binat inet6 from 2001:db8:1::/64 to 2001:db8:42::/64 -> 2001:db8::/64", + "pass inet6 proto icmp6"]) + + ToolsHelper.print_output("/sbin/sysctl net.inet6.ip6.forwarding=1") + + def vnet3_handler(self, vnet): + ToolsHelper.print_output("/sbin/route add -6 2001:db8:42::/64 2001:db8:1::1") + + def check_icmp_too_big(self, sp, payload_size, frag_size=None): + packet = sp.IPv6(src="2001:db8::2", dst="2001:db8:1::2") \ + / sp.ICMPv6EchoRequest(data=sp.raw(bytes.fromhex('f0') * payload_size)) + + if frag_size is not None: + packet = sp.fragment6(packet, frag_size) + + # Delay the send so the sniffer is running when we transmit. + s = DelayedSend(packet) + + packets = sp.sniff(iface=self.vnet.iface_alias_map["if1"].name, + timeout=3) + found=False + for p in packets: + # We can't get a reply to this + assert not p.getlayer(sp.ICMPv6EchoReply) + + if not p.getlayer(sp.ICMPv6PacketTooBig): + continue + + ip6 = p.getlayer(sp.IPv6) + icmp6 = p.getlayer(sp.ICMPv6PacketTooBig) + + # Error is from the router vnet + assert ip6.src == "2001:db8::1" + assert ip6.dst == "2001:db8::2" + + # And the relevant MTU is 1500 + assert icmp6.mtu == 1500 + + # The icmp6 error contains our original IPv6 packet + err = icmp6.getlayer(sp.IPerror6) + assert err.src == "2001:db8::2" + assert err.dst == "2001:db8:1::2" + assert err.nh == 58 + + found = True + + assert found + + def check_icmp_echo(self, sp, payload_size): + packet = sp.IPv6(src="2001:db8::2", dst="2001:db8:1::2") \ + / sp.ICMPv6EchoRequest(data=sp.raw(bytes.fromhex('f0') * payload_size)) + + # Delay the send so the sniffer is running when we transmit. + s = DelayedSend(packet) + + packets = sp.sniff(iface=self.vnet.iface_alias_map["if1"].name, + timeout=3) + found=False + for p in packets: + if not p.getlayer(sp.ICMPv6EchoReply): + continue + + ip6 = p.getlayer(sp.IPv6) + icmp6 = p.getlayer(sp.ICMPv6EchoReply) + + # Error is from the router vnet + assert ip6.src == "2001:db8:1::2" + assert ip6.dst == "2001:db8::2" + + found = True + + assert found + + @pytest.mark.require_user("root") + def test_npt_icmp(self): + cl_vnet = self.vnet_map["vnet1"] + ifname = cl_vnet.iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s mtu 9000" % ifname) + + ToolsHelper.print_output("/sbin/route add -6 2001:db8:1::/64 2001:db8::1") + + # For unclear reasons vnet3 doesn't respond to the first ping. + # Just send two for now. + ToolsHelper.print_output("/sbin/ping -6 -c 1 2001:db8:1::2") + ToolsHelper.print_output("/sbin/ping -6 -c 1 2001:db8:1::2") + + # Import in the correct vnet, so at to not confuse Scapy + import scapy.all as sp + + # A ping that easily passes without fragmentation + self.check_icmp_echo(sp, 128) + + # Send a ping that just barely doesn't need to be fragmented + self.check_icmp_echo(sp, 1452) + + # Send a ping that just barely needs to be fragmented + self.check_icmp_too_big(sp, 1453) + + # A ping that arrives fragmented + self.check_icmp_too_big(sp, 12000, 5000) From nobody Mon Jan 22 13:15:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJW1G0n0Tz57tZs; Mon, 22 Jan 2024 13:15:30 +0000 (UTC) (envelope-from karels@freebsd.org) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher 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 "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJW1F5yh6z415H; Mon, 22 Jan 2024 13:15:29 +0000 (UTC) (envelope-from karels@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 40MDFN8E035918; Mon, 22 Jan 2024 07:15:23 -0600 (CST) (envelope-from karels@freebsd.org) Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id XSgiIGtqrmVMjAAAs/W3XQ (envelope-from ); Mon, 22 Jan 2024 07:15:23 -0600 From: Mike Karels To: Alexey Dokuchaev , Jessica Clarke Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 636592343c3e - main - tmpfs: increase memory reserve to a percent of available memory + swap Date: Mon, 22 Jan 2024 07:15:22 -0600 X-Mailer: MailMate (1.14r6015) Message-ID: <04794665-EFCA-4E89-9956-B18684898C9D@freebsd.org> In-Reply-To: References: <202312191534.3BJFY3fo030908@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 4TJW1F5yh6z415H X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] On 21 Jan 2024, at 21:48, Alexey Dokuchaev wrote: > On Mon, Jan 22, 2024 at 03:27:57AM +0000, Jessica Clarke wrote: >> On 19 Dec 2023, at 15:34, Mike Karels wrote: >>> commit 636592343c3ec0feb61a4d8043676381384420dd >>> >>> tmpfs: increase memory reserve to a percent of available memory + swap >>> >>> [...] >>> >>> Add sysctl for vfs.tmpfs.memory_percent and the pre-existing >>> vfs.tmpfs.memory_reserved to tmpfs(5). >>> >>> PR: 275436 >>> MFC after: 1 month >>> Reviewed by: rgrimes >>> Differential Revision: https://reviews.freebsd.org/D43011 >> >> I just got: >> >> make[6]: Could not create temporary file /tmp/makeDl4i9S: >> No space left on device >> >> after doing a buildworld -j4 on a 4 core, 16 GiB system where /tmp is a >> tmpfs, with the prior buildworld having taken me past this commit, >> which I strongly suspect to be the cause. Whilst I understand the >> motivation behind your commits, this is a sad regression to have; it's >> not exactly a particularly strange situation. Bug 276402 is about the interaction of this change with ZFS ARC, which seems to be problematical. I spent some time investigating yesterday. Depending on the dynamics, I get different results. If tmpfs grows, the ARC will be reduced if needed. But if the ARC grows to the point that tmpfs sets free space to 0 or quite low, attempts to write to tmpfs fail without any reduction in ARC. Jess, two quesions: 1. Are you using ZFS on this system? 2. Can you try with vfs.tmpfs.memory_percent set to 100? > FWIW, I've seen two people complain about this last week, apparently > this kernel OOM protection doesn't work very well. :-/ So far, I have only seen OOM kills when memory + swap are quite short, with a tmpfs memory_percent above 95. But with ZFS, it can happen when the ARC could have been reduced. I will investigate more today. If I don't find a way to resolve this, I'll probably commit a change to set vfs.tmpfs.memory_percent to 100 by default, at least for now, and if that works around the problem. Mike From nobody Mon Jan 22 13:23:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJWBh6nNHz57tv7; Mon, 22 Jan 2024 13:23:40 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJWBh6F05z41dJ; Mon, 22 Jan 2024 13:23:40 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705929820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CTxbSZ125kEyAUrIvsOS5Ehn1E3U637pAdUdMBDUB+I=; b=wxk1AQBJzSteJPE5wNXbTxieHs82PUMXcaa8bEIEDLcpXuUpE+OJNUAG3Y6juXMTtOl7pY w9vhOxF8H3UyoTurVUCCPv4yY2QjYZ8CZF1LFA8YWAyfuRgGEkHMQrgaKSdjtsgwZYNoQU W4IrOaj6ehhuI436P/ERFASUv2rfZB0fkxt9MM/ZaL1tobCCZwmdTX1c+bNlcHG7MD3yDQ cLe1v+sQkXxaTB5jlOto/hbn2U6tZHtgC/jWsydDFcrGfpyDJJFooJcPf80vq8Tg0zAYrn T4+aPWj60va2ouOr6RKQ1P8TxcJAbFrdkS1e7EBNvr0Ta3Y1vg7h4mYXjXGAgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705929820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CTxbSZ125kEyAUrIvsOS5Ehn1E3U637pAdUdMBDUB+I=; b=k3C6DZPRNVCF3shN6u6DrSAIqJZ+25dQ8mvMF9ANgXvcinCZOB2VVzykbI53GDyDy1Z4dt fWyLymzuVd9Wu4JKGEOjPQnYUtWINV+S+fNnYDyB5PjIhSqPVQENxgpTZGx6xgCudKrowF 6xH5tR8FKY0S1Kr+Y8P34VO9tj+4jQ6fEQBopGw95U9cxSjvYEv3or1r/Tzo6kUd2PTtAt Sbb9G1YRq3Ip7qgl4HKdsuEuOIyAgnRt3fXjPbjgYKXtIJU74HRWidqwBKo3g+tUwThIRv cQY97bg8uPTSjkMgZ1e/HYgxZmet5QvYQRDYC2yAc09x7p0YSrnD4CBSoPKoag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705929820; a=rsa-sha256; cv=none; b=q5yj8EiB9FOJQQ0V2bFylSwIkb/rTdOLREYG+CoTxSkjg08UsoBxvq0Yk/nXtlhCPQqj0t qgGxEEBmnv8TjMNptpqLxHKw2XVvXHFLixKOOl3un5iYRx0teNbPjtTj3Q5ehPrryAVLc8 7Dpzp9ItA8++X6LmoczMygds09+xUYX+DYzfhm8kSKtNf4Sgu1LiN9GDX5rtkQ4LjOv9R0 i9ZVnPawfmVSs+FKCIk9AaL7XJGIL17Qe89GW4wwJhD2/MvUFa51PhlKbBhkhXEZ1dxY9x Rzb4ZxjWieFy4nXHwE3Hyng4B4xjY88WBvvkI3sxBEpd0iqcCswPENnPJdSETA== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TJWBh4dhszb7D; Mon, 22 Jan 2024 13:23:40 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 05BB19F356; Mon, 22 Jan 2024 14:23:37 +0100 (CET) Date: Mon, 22 Jan 2024 14:23:37 +0100 From: Baptiste Daroussin To: Mike Karels Cc: Alexey Dokuchaev , Jessica Clarke , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: Re: git: 636592343c3e - main - tmpfs: increase memory reserve to a percent of available memory + swap Message-ID: References: <202312191534.3BJFY3fo030908@gitrepo.freebsd.org> <04794665-EFCA-4E89-9956-B18684898C9D@freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <04794665-EFCA-4E89-9956-B18684898C9D@freebsd.org> On Mon, Jan 22, 2024 at 07:15:22AM -0600, Mike Karels wrote: > On 21 Jan 2024, at 21:48, Alexey Dokuchaev wrote: > > > On Mon, Jan 22, 2024 at 03:27:57AM +0000, Jessica Clarke wrote: > >> On 19 Dec 2023, at 15:34, Mike Karels wrote: > >>> commit 636592343c3ec0feb61a4d8043676381384420dd > >>> > >>> tmpfs: increase memory reserve to a percent of available memory + swap > >>> > >>> [...] > >>> > >>> Add sysctl for vfs.tmpfs.memory_percent and the pre-existing > >>> vfs.tmpfs.memory_reserved to tmpfs(5). > >>> > >>> PR: 275436 > >>> MFC after: 1 month > >>> Reviewed by: rgrimes > >>> Differential Revision: https://reviews.freebsd.org/D43011 > >> > >> I just got: > >> > >> make[6]: Could not create temporary file /tmp/makeDl4i9S: > >> No space left on device > >> > >> after doing a buildworld -j4 on a 4 core, 16 GiB system where /tmp is a > >> tmpfs, with the prior buildworld having taken me past this commit, > >> which I strongly suspect to be the cause. Whilst I understand the > >> motivation behind your commits, this is a sad regression to have; it's > >> not exactly a particularly strange situation. > > Bug 276402 is about the interaction of this change with ZFS ARC, which > seems to be problematical. I spent some time investigating yesterday. > Depending on the dynamics, I get different results. If tmpfs grows, > the ARC will be reduced if needed. But if the ARC grows to the point > that tmpfs sets free space to 0 or quite low, attempts to write to > tmpfs fail without any reduction in ARC. > > Jess, two quesions: > > 1. Are you using ZFS on this system? > > 2. Can you try with vfs.tmpfs.memory_percent set to 100? > > > FWIW, I've seen two people complain about this last week, apparently > > this kernel OOM protection doesn't work very well. :-/ > > So far, I have only seen OOM kills when memory + swap are quite short, > with a tmpfs memory_percent above 95. But with ZFS, it can happen > when the ARC could have been reduced. > > I will investigate more today. If I don't find a way to resolve this, > I'll probably commit a change to set vfs.tmpfs.memory_percent to 100 > by default, at least for now, and if that works around the problem. > This is easily reproducible with poudriere, if you try to build some ports/packages which are big memory consumers, for example any chrome variant or just lang/rust, I have a machine with 64G of ram and it is impossible to get lang/rust build in poudriere (USE_TMPFS=all) without setting vfs.tmpfs.memory_percent to 100. the poudriere dies with plenty of no space left on device. Best regards, Bapt From nobody Mon Jan 22 14:29:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJXfF5973z5817n; Mon, 22 Jan 2024 14:29: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 4TJXfF4htbz49sH; Mon, 22 Jan 2024 14:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705933749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cg0FMp8wfAdzUp2qwtpaNwjykT+QRPcmjIwp9jhqQT8=; b=dyOwPDBVdo7upB7/RuEUcavauTxmFGtcmvnUxjJ8lvQ3N6D4ReD19NYqfxrsbZFdzLFpWh as2n/a1fQmaH5s/3BsmfH/FpMR5EJyXcojjlqGJudVDrJQXXEqt8mQfzdRhrL1hJFfZdRW Npu5sqtYgNT7x2NTTXwAWBnOV/8h8ZdC1kWloP4YPWp98+GaxpCKR4p2Irg/+O9OJTqMk4 4OGDidMiPkpRFerOMHgQFI4A2MvLDglw4zGPfdD4TM9hbdKe1z40tAqeR1s9AP1Yl00+Nd XN+53F8DHF/c+Q0b7iyQsOXZIV5rtLFu2ON22em/K8Ihxut7FS3Rsi1oF1bsgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705933749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cg0FMp8wfAdzUp2qwtpaNwjykT+QRPcmjIwp9jhqQT8=; b=j9tZEqAWHXI1UFIw+4BZuOIPlYEn7WrtJWmPhIQ+7dFpqu0p7xpas+TgkCvroOKAMRI0fb HftFVy5OsOei1TZDZkDcWVO/NsxOehBj6X/i7nSRVPAdz3EDl9yJWrQWiOMCFkOEc8hCOR xbDZWrvAn0OYUk+JvXObbMqJP9dtwK/YqQLkaValz13S9bMUkvJp78I2tf4qEH3oOJuIx8 J7241lSIFkmO4pW8PjlKIW5ou9NGQ4aK+mjs1lrtrD5y7YfhhBtQj/d6uU6TYoB/12+BvT fVBbH1YgLW+3toxu687tVzy9mrCToZIwoNUMc1Fj20s+MZUAgYwfUUKIjVXt+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705933749; a=rsa-sha256; cv=none; b=auvlWbh9Cvi7wyAOuewcPTsPY1R5ipGYH9n7lnFLOoAWxRQM8KX4L0r27lmQM9YjqH17PZ 3giU7S6gvg+i1BRxE8SGvXdCY/6r4fo5uKGmyULqTMzEPLWAjK+WsUUkAfJWO4fXDC1RAt cT7YUvD6wWhxRnX90WE/WNhSGK1iYYSke3uh0TwK9clUZjRSqL/cCRcWF/U7XGC5G5P/00 uMkzd9lybnkN6Lx7bK3Aa+2hrt7qftCvbCVwD3bqtxSSdV1CMLNqI9pg2oFJk1PZwxr5Gc Co7GYbupEosfCRlTkZL+CbcMKG14v1ylGSKTnwO1QYsuTyvLAhfKi202RDHp3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJXfF3lxfz15Dy; Mon, 22 Jan 2024 14:29: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 40MET9qi001233; Mon, 22 Jan 2024 14:29:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MET9eJ001230; Mon, 22 Jan 2024 14:29:09 GMT (envelope-from git) Date: Mon, 22 Jan 2024 14:29:09 GMT Message-Id: <202401221429.40MET9eJ001230@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: d8d0ecd9739d - stable/13 - makefs: Handle missing link keyword in mtree spec List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d8d0ecd9739d5201c6d56d1a898b95f7ce35bdf5 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d8d0ecd9739d5201c6d56d1a898b95f7ce35bdf5 commit d8d0ecd9739d5201c6d56d1a898b95f7ce35bdf5 Author: Stéphane Rochoy AuthorDate: 2023-09-21 07:14:20 +0000 Commit: Ed Maste CommitDate: 2024-01-22 14:28:57 +0000 makefs: Handle missing link keyword in mtree spec PR: 241178 Reviewed by: emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/850 (cherry picked from commit d26c1a0f8bceb6748436fe3fc57bac3ef8179dd3) (cherry picked from commit be31bd59895e57fb7359de870ea3ecc19e3d1ae1) --- usr.sbin/makefs/mtree.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c index 688ce81e733d..1fe2eb4097b2 100644 --- a/usr.sbin/makefs/mtree.c +++ b/usr.sbin/makefs/mtree.c @@ -740,7 +740,10 @@ read_mtree_keywords(FILE *fp, fsnode *node) type = S_IFREG; } else if (node->type != 0) { type = node->type; - if (type == S_IFREG) { + if (type == S_IFLNK && node->symlink == NULL) { + mtree_error("%s: link type requires link keyword", node->name); + return (0); + } else if (type == S_IFREG) { /* the named path is the default contents */ node->contents = mtree_file_path(node); } From nobody Mon Jan 22 14:33:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJXlQ3wVHz58203; Mon, 22 Jan 2024 14:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJXlQ3M5Gz4F4y; Mon, 22 Jan 2024 14:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705934018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FJbezc6jyp9DCmq1KfnMKhzHHCQkjz5OHTjHr1uq/Y4=; b=vFfPgOKuDHja5cF7nayeifjWEFFTX75X767D+fJNPYm+66euMN1l9CwfmfluzHHpoam5zb QGEWV9D9ktga/RKXISG+T1drCRttmu8Re6DxZzmlsLtGbE1T2z+7xMZIuwHGVhNZlcwU1M worV73jIwtkgFVUnB+CLLW/tDpj7sH5eIT73vXY6lofA+JE/5F7nYp07/cWpqja4lvpadO r21jlBhD6UIJI5db010O870y8loSb1aSwdUm+0jGEWHLhyDkZgvNsTMIJYuWnlOTIi1yy5 57R50nVrm0t//OZgpItz33P1ycf1whNnynXt31MT8GgTJer55QLGoYnbrZlxgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705934018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FJbezc6jyp9DCmq1KfnMKhzHHCQkjz5OHTjHr1uq/Y4=; b=WJ7M4z4SndKY6Z39nrwalu2Z/dJCkrxZ3FhpJPq6MV2IxJV7mUVUbur8oeJhX8QFKNAdMo xMC7YHDm7FhQq0Qoqbp8jGLcX7nQpAQTvYaCSi3UMJ1TxRAvu/zxGpUhahvza+fgnI7m8/ LJJ4+CAHkLa9HoTDU0RyvhA6ctlj29AmO/YMd0JZRX1+knte39n98fJk/EiyPIQqBwq1s6 aCRAxRR/yJoL+omGmu9Ir2UQq1z3OuIGrkB0J+f11jOmTYMQCUTiO4dyRBmMUSuUWb4loR SDlHnS13dqCB+qwsPsAw5deeXTCBaeIBpZv+QegQelnrDwN9XpPx9xERoR8icw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705934018; a=rsa-sha256; cv=none; b=Mh3a3LqQjReNF1ONFhsXaIZFGFFDn/50y7dxT9SOYO11b2bGO/CaRHLYkk5kKuCIRgVSWM 7S99BkHXcA1DEQC67Tg5DBW8loQJONqAQP2hxtbgWw3vBBOz0SSEodfm2ZIvY/h+qxrgMn WSgmwdIHRMN/rAeslmyxbEOjGf+/w4MfQtJsn0djbqHWcw+nSMkzbPJo8KAQUooEtgpCVQ 9QsjskysQ3JhoRy3Wc+7+uAI6AKQB+D+FQsXAFrQEr3FInm2RjIvFWF2K0mHVFDDJvxxwe H3lijofacYUZxOS9cR0s22GxxpiCNTz3nhM5EQ1QEYUdo/KKcB21JnaEE4SP0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJXlQ2QqQz15JH; Mon, 22 Jan 2024 14:33: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 40MEXcPT016964; Mon, 22 Jan 2024 14:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MEXclV016961; Mon, 22 Jan 2024 14:33:38 GMT (envelope-from git) Date: Mon, 22 Jan 2024 14:33:38 GMT Message-Id: <202401221433.40MEXclV016961@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: 1614823a499a - stable/13 - release/oci.conf: add missing vm_extra_pre_umount() steps List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 1614823a499aa7a46aa8ab4ed06a6d1b71e0bdd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1614823a499aa7a46aa8ab4ed06a6d1b71e0bdd9 commit 1614823a499aa7a46aa8ab4ed06a6d1b71e0bdd9 Author: Ed Maste AuthorDate: 2023-05-24 15:45:29 +0000 Commit: Ed Maste CommitDate: 2024-01-22 14:33:06 +0000 release/oci.conf: add missing vm_extra_pre_umount() steps vm.subr's default vm_extra_pre_umount removes /qemu and /etc/resolv.conf. When vm_extra_pre_umount is overridden these steps need to be performed in the cloud-specific conf file. PR: 271602 Reviewed by: dch, lwhsu Event: Kitchener-Waterloo Hackathon 202305 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40257 (cherry picked from commit ae60012e46ecfe59a3506b903e685b6a3347807b) --- release/tools/oci.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release/tools/oci.conf b/release/tools/oci.conf index 7260cd24defd..47231d65d79b 100644 --- a/release/tools/oci.conf +++ b/release/tools/oci.conf @@ -90,5 +90,10 @@ EOF touch ${DESTDIR}/firstboot + if ! [ -z "${QEMUSTATIC}" ]; then + rm -f ${DESTDIR}/${EMULATOR} + fi + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } From nobody Mon Jan 22 15:11:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJYb84WzWz57b8y for ; Mon, 22 Jan 2024 15:11: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 4TJYb844Rwz4Jvw; Mon, 22 Jan 2024 15:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705936292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lR6FQ/cbvaUChC5DyZsi6gMUJ+Sp+hQxiB2tKVKFRE=; b=IzGAmtOfTkx0I9zBlcEBChlRCWTQOFuXqsNX9XiOhV191tB/we+A2w8bLdbg1He5OGI3pE TNAmazci7gLVU4pEWzZ/T78NdNDzKbVmmz4mfcgVhgFUWSd37IZtbUe5zWZDhXxZNsfqfX myZCo5q5r5uGEW2JITj9zBTRy4XaJ7/8Mw0+M97ZIgse/SU2xfk8w4TC61NDL1ntWZ6SZu NArrgm9XlcO7SFTeDh6wDYJ+ifOPVfWkf8zgz4uHcvJ7QpNhWx8UjvCjlgTt90ffSi1GWy 2i74j/8+l7/LrJfTDrscfVCLZHlHVqcKvfT6AlAFViGyv5IzoEAd5DtVEa+WoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705936292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lR6FQ/cbvaUChC5DyZsi6gMUJ+Sp+hQxiB2tKVKFRE=; b=LiISYY1G3JfE2uCyGF1Y8SqR5c3WEQKiaHaQJUlDnvPrN8wJtylhxEHwjTBurIUoO+xxLZ u88/DCmBI8Y06xRXqJLXUi8n7w0LT67dS2jeX6hD2L0zIrF+LMJB5bSIMB/uqLYYrQXfL7 Tbqmkq7dQmWKfsq3yLOQMwsbaflXWSUpyuCU0eiThIC6///rjj0CVNgjvffzgUnZBavXM+ BexYVb4V0FXu3JzAh6OSFhK5pAsb40l6j6hK9JovpTAAO8cfoN5MXHT1Cy57duc6ljSsDy foRi/ftNg/W4KRt9QaPbinJEug/qX06GOzdwpXPAsgRIkuv3mWZ7sqvHZ8lmnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705936292; a=rsa-sha256; cv=none; b=e8vxXeVSuEX43BTuyIL/SoR4+PCUWNmNIi+msPrlkXvt0hR+FiYeYXY/dfe1fiXGJsy//x 3JMBayNqUuqMet/cEbJaccIohA5DCp11F42KsdSCiEaiqqOek7Isfvo2o9XRrQgVP7bOZz g3jeLuKTlC6AiG07vDS3aMUiGSlC3K6LjlHj23AUJ1L1ePQRgBt7rzIxuSfi6j83p17Kad S2noNSIDFns57E4yyZkssGt2BWy85J09P/x+W12fR3qwjdIzC9KXw+cXmnv5rCYPLkdVLs 4bgURcUwqsTtxKcqgO0wJ8ip2B/NaEOyWCYw7EzJei45PzFgsXwpkwvkAm4cng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJYb82qM9z15p6; Mon, 22 Jan 2024 15:11: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 40MFBWTs082854; Mon, 22 Jan 2024 15:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MFBWAX082852; Mon, 22 Jan 2024 15:11:32 GMT (envelope-from git) Date: Mon, 22 Jan 2024 15:11:32 GMT Message-Id: <202401221511.40MFBWAX082852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: 3a88fe133543..cdad538768db - vendor/sqlite3 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/vendor/sqlite3 X-Git-Reftype: branch X-Git-Commit: cdad538768db9e2c8258d19e9282fb5aaae80e46 X-Git-Oldrev: 3a88fe13354325b9f56f07927e654de4f5398707 X-Git-Newrev: cdad538768db9e2c8258d19e9282fb5aaae80e46 Auto-Submitted: auto-generated The branch vendor/sqlite3 has been updated by cy: URL: https://cgit.FreeBSD.org/src/log/?id=3a88fe133543..cdad538768db cdad538768db sqlite3: Vendor import of sqlite3 3.45.0 From nobody Mon Jan 22 15:14:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJYfq4y4Yz57bRf for ; Mon, 22 Jan 2024 15:14: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 4TJYfq4TW4z4Kgv; Mon, 22 Jan 2024 15:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705936483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18sMmwnVGAfzKGttNVCh0XIFnhRI57FNIogUag8g0pg=; b=yywTLb6ye3hH+RPEdE6HeKvUZrf6Go74/9uu4RhQWyma60FOmiJJWTWidCvrvS3e8YOJFH fgEACvtKGj1B/59f2h6/3r0fpM5DwhX4/44PrDU4H1sfoz/SjYinZeQevdGZQbKjQffo21 wNkdwcPmpVOeKA9XpDSef6BM+mHkQB6IS9Pg61zyZfLW1BjtZmFIMzCniPUOrz0dqhOdsa fAkn0z/4A6BFAR4d+aSWrPI/BcFdn65TWHou9LZ5QOWliQYvW3gRllfaIl352bDOIlCNWs wzyvmDCvaU+hU3utmKwoZ9BgmnRUXBLTOR5Ui9kdIxBdBteY6AxmBS/OacgF5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705936483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18sMmwnVGAfzKGttNVCh0XIFnhRI57FNIogUag8g0pg=; b=Zr4HlPUkmj5+5mOqV56BO3cFHbeK/ynUSRBq12+WKmAMkGL7hDd5fbP2PwsEKn4yCQCyOY TD662f3eHHvo0oJyApJcKIaqTYzf/v0+YXukE9WwxeHMITUYvCd0bXkiIuNsVXyQyTbqkk sYFRVX5uf6WSECGyx764XPXJwLFSk8ZdkPLlFEXuCy/MMbf9dVs6E41mu41sRuSfzWydsq 4Bwhbq6Qm0B17gcSH+cEikbeTsOzkbUIfTOreYH/k4M0CagbT4olHpTo20Un9i7Pp00af1 hFyb2t0uWCPCe6MkCF38cl83771+vrxH+QKKUvavbbdEd2lzazgrdjLXReANRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705936483; a=rsa-sha256; cv=none; b=h9fgM7OIUncpRLsJ3v3SQcKli+PwJgAkQhv9ZZrofZF82v2TOFCxOlurnnucyTNw2F0X3A pkwzxEUJ+zGeYNzu5scQhtUgoXJ52FnLS+tMOfrlf4o3GNVhheJZ8V8ClBfZ1o4NAyaBRJ lKNY+2QXUHgrwX4PJxDW95OscqfjlTby0zgmbvJbwmMO6YMng04EFPhFKzXFryBxhM28+H /cL3/9/dx2CHHxP3pwEPPy19RLu6qppokiid3kfrBTH+JnJfHYO7zkuVIeMsvC7HgNoD3b Y0cknNc/yq8E0RIQOrUlrgJtmmJG/4j4FQhampJEHQCjJ5xHbQJKEf0+5/sfkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJYfq3YMRz16YS; Mon, 22 Jan 2024 15:14: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 40MFEhFq084581; Mon, 22 Jan 2024 15:14:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MFEhed084580; Mon, 22 Jan 2024 15:14:43 GMT (envelope-from git) Date: Mon, 22 Jan 2024 15:14:43 GMT Message-Id: <202401221514.40MFEhed084580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: 0f53671786a6 - Create tag vendor/sqlite3/sqlite-3450000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/tags/vendor/sqlite3/sqlite-3450000 X-Git-Reftype: annotated tag X-Git-Commit: 0f53671786a665cf5f954c19ace6922557203a3d Auto-Submitted: auto-generated The annotated tag vendor/sqlite3/sqlite-3450000 has been created by cy: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/sqlite3/sqlite-3450000 tag vendor/sqlite3/sqlite-3450000 Tagger: Cy Schubert TaggerDate: 2024-01-22 15:14:14 +0000 sqlite3: tag 3.45.0 commit cdad538768db9e2c8258d19e9282fb5aaae80e46 Author: Cy Schubert AuthorDate: 2024-01-22 15:10:03 +0000 Commit: Cy Schubert CommitDate: 2024-01-22 15:10:03 +0000 sqlite3: Vendor import of sqlite3 3.45.0 Release notes at https://www.sqlite.org/releaselog/3_45_0.html Obtained from: https://www.sqlite.org/2024/sqlite-autoconf-3450000.tar.gz From nobody Mon Jan 22 15:36:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJZ7X5fCQz57dRr; Mon, 22 Jan 2024 15:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJZ7X57q2z4MmL; Mon, 22 Jan 2024 15:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705937768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1V01mDDQcuIdhroJ06ck0nMmYhPSSWQmeEGFzdI+SAE=; b=aMmbzAOsj8KFfI0LSpUgSw1ocLQDWNqOYkxO2JIg+oH4rDPnpcvqMbMvalmD/c4oI0fZ/4 gYWVD8S7sMlaKWmVwmqfazQUlKHJZQShXZUTHbv2uAghuE5QsGsBMq4NUivvaKm6bp70Lu narzipa6scZJ0AFTo9vGwPBbtkVQTC5XXdasYXAq0icZrhH19mbn67IiZnXZ5V+FgsGcqH xL6iNGxUEgOicil4ah7kBJ/XOcuwDGto0ytJy495Tu8LlPklxhpA7X5dDCeV1FsuGUN/ZX vaQZmKizQPCrjfdEMOLgm6bzv7R40ZuXRVk0kSJ7qAcSmShxj0vv5aCl4LnzQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705937768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1V01mDDQcuIdhroJ06ck0nMmYhPSSWQmeEGFzdI+SAE=; b=Y5DevIVBiysIBGfoyMBeXcce6rQJmqvcuPtUE+7ZwaqS/AiONbSPiNmWjvy1DpjzfKXbB0 UghM3WTcXZU+YsOhzs1x2JiniYJ9M32dw1qsS8k8lxuW2UXmxXWxZ8nx6+9a4B19a1NVgD URzyswZBVVM/uGYNed7+WQc8tR64Kj+BpOhILi8DNEeeEIt3LDFJRnoGeg13gLqXpem/8u 3QvRVaArDF74tp5f8aHTBNXo+Hp3Gwl1zZx+HHYrFjPJAioL72A/BW/8hSzB6shAJKfqNK saCQlbSImIv04QAVOiak5+1zoJsPymWUF2bCylEhhdSTGkTaKmtCPkb2BKEsRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705937768; a=rsa-sha256; cv=none; b=K/K9bbPptsBN4EgpuClumMHNS5ud1yj2+DFaukXftlLkZMspzVVN2pBaB3mTa5sUwRT5uv NXRlU/vEMQaoRbwF3p8+sETwxNhi40/yHQwuKSAuRx5fBq85aBNDPfHcLvNMWoYHWbfdmw NMKWYgnWhMxeZaQC5wC9AUYX89HKHDPE+5gSkF/lDqdSYaZ04lWCtnUoYfty5ENWWkRP4i RBHjJ6a8ap9uPsgWLbgPJ3pTcoEvB/lJJzmG1ULU0YsWtrysTVNZZpPw0VtK4sw+o+uEM0 AnmegHwfj721ZZQQNfO7IR+Y4bcShS7XYlaRveKSA4qXdP+pD7ut3SHP6BbiiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJZ7X4Bb8z16pr; Mon, 22 Jan 2024 15:36: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 40MFa8qE018363; Mon, 22 Jan 2024 15:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MFa76T018360; Mon, 22 Jan 2024 15:36:07 GMT (envelope-from git) Date: Mon, 22 Jan 2024 15:36:07 GMT Message-Id: <202401221536.40MFa76T018360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: c19fb1f963e3 - main - sqlite3: Vendor import of sqlite3 3.45.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c19fb1f963e3dc88a82b20d1b17f94a4cd321e74 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c19fb1f963e3dc88a82b20d1b17f94a4cd321e74 commit c19fb1f963e3dc88a82b20d1b17f94a4cd321e74 Merge: 57c50d6b3673 cdad538768db Author: Cy Schubert AuthorDate: 2024-01-22 15:35:06 +0000 Commit: Cy Schubert CommitDate: 2024-01-22 15:35:06 +0000 sqlite3: Vendor import of sqlite3 3.45.0 Release notes at https://www.sqlite.org/releaselog/3_45_0.html Obtained from: https://www.sqlite.org/2024/sqlite-autoconf-3450000.tar.gz MFC after: 2 weeks Merge commit 'cdad538768db9e2c8258d19e9282fb5aaae80e46' contrib/sqlite3/Makefile.msc | 1 + contrib/sqlite3/configure | 20 +- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/shell.c | 3183 +++++++++------ contrib/sqlite3/sqlite3.c | 8087 ++++++++++++++++++++++++++------------ contrib/sqlite3/sqlite3.h | 152 +- contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 18 +- contrib/sqlite3/tea/configure.ac | 2 +- 9 files changed, 7698 insertions(+), 3769 deletions(-) From nobody Mon Jan 22 15:49:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJZQt35wDz57fYd; Mon, 22 Jan 2024 15:49: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 4TJZQt1LKlz4NZb; Mon, 22 Jan 2024 15:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4Pw4RC+95vPEvHO014EYye/ZBB/kWc9G1ojDwbJ+Fw=; b=q/dizOBySRoRCnZrsjpII345Rq3bRhEcXSr8McQAqE4sKiJit666amA2SEM7BeTQNPqTvR S08nizPCccS4gP6JCtX8ZBxuX1XThkYmxPqCUxUIb0z1B9e2vh6f5H2MjK15qPlMvoa4iy 31ij4EQbNOK5TNmbUSV+q7Y0I4FW7//uLXw1tH+em5HmkjT+PhIupUv1Jr3hsSqqGgjPX6 Oca8I50dpQ3ZSj7ve1vJmUDzup1JA5W2VYTHxT/5+1CFlemx5jKseQ2G2VjppQetqunGz1 g8OUBWvOFyuge1BtNNWoenBwRrJSs/5L+eVfI41ruEA+29LNefGWuVtg/9c1DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4Pw4RC+95vPEvHO014EYye/ZBB/kWc9G1ojDwbJ+Fw=; b=SGKHDGfCAqSM1TWGIMeLt5+8sm48D6oHXqBC1JOSbjz9Bvp9LCpGwRM/5B2bdZrAzSr5qA RTlJxDFdLZpSUjk1jkmo8oIGnUa+W87UMmcyWA+tv56mweGS/mcsy1b+ANq99VQfvgqrve nMdWRi6sbae9p/DSfZAfHRvW/f8wil+z3D+n0b89ee1IrMZCwzX/ZvWGnlS2DF85azEcAC JWPgF9FvXUVYnvRwldxHt+q/dBQZ5RS6VbGa01aOHCBl7jrW696++hSR41hVirJHzIGwc6 M17LCL+Xio7yNG+3q08cpVaW9h+NRzrfec4l9TqSuGGkWaXrXSb0EltPNtKUwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705938566; a=rsa-sha256; cv=none; b=pNgnvaRchdx3sstQccgHFqTWrF9vEroqF0FKcEqXvMrMtzFcCynC7zwRnsFxvYvL2Cn3Iu g0sC/5mUSr5xAYavHwiDl9DFFtum5pJEP/XpJ5JYnKlnZdZxHmCZ6CsBl1bkeIYryTMT3D Mgvwo3P0ZJrFhVkFkZhkFUhHP0JcdWL1Ldn1RSLEZMxnGRsDe2HI4O/DrMMRzzFib6TRRW GGf5GoqUuIN4pSX9HDSHmkwfk7XFK3eDfkFvkqGqxozYSKQ1BhcWBWJd7sqtgmkXtw2JWk vEmpt6ea71dI/RB6C98fiveAbk+qWFR9c5h/JfkfuPXAQ06JAMDxeCCP3qPfnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJZQt0QhNz16my; Mon, 22 Jan 2024 15:49: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 40MFnPTO035039; Mon, 22 Jan 2024 15:49:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MFnPYF035036; Mon, 22 Jan 2024 15:49:25 GMT (envelope-from git) Date: Mon, 22 Jan 2024 15:49:25 GMT Message-Id: <202401221549.40MFnPYF035036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 17e941a0c88c - stable/14 - kerberos5: Mitigate the possibility of using an old libcrypto List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17e941a0c88cac2d8cd28d6614448adbd65d4b72 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=17e941a0c88cac2d8cd28d6614448adbd65d4b72 commit 17e941a0c88cac2d8cd28d6614448adbd65d4b72 Author: Cy Schubert AuthorDate: 2024-01-18 08:22:20 +0000 Commit: Cy Schubert CommitDate: 2024-01-22 15:49:05 +0000 kerberos5: Mitigate the possibility of using an old libcrypto By using the full library name (libcrypto.so.30) we avoid the exposure of using an old, possibly vulnerable, library. Reported by: jrtc27 Fixes: 476d63e091c2 (cherry picked from commit 0990136ed1753ac7837206f9c5f4b83ccff6c405) --- kerberos5/lib/libroken/fbsd_ossl_provider_load.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c index 497b32124f96..2328041bc166 100644 --- a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c +++ b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c @@ -5,6 +5,7 @@ #include #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) +#define CRYPTO_LIBRARY "/lib/libcrypto.so.30" static void fbsd_ossl_provider_unload(void); static void print_dlerror(char *); static OSSL_PROVIDER *legacy; @@ -46,7 +47,7 @@ fbsd_ossl_provider_load(void) { #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) if (crypto_lib_handle == NULL) { - if (!(crypto_lib_handle = dlopen("/usr/lib/libcrypto.so", + if (!(crypto_lib_handle = dlopen(CRYPTO_LIBRARY, RTLD_LAZY|RTLD_GLOBAL))) { print_dlerror("Unable to load libcrypto.so"); return (EINVAL); From nobody Mon Jan 22 15:49:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJZQs0xGwz57fmg; Mon, 22 Jan 2024 15:49: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 4TJZQs0Mfhz4NlB; Mon, 22 Jan 2024 15:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=212154dIxDoYbSClHorq1WRpuYpdQSU2lnPwvPZ6UVE=; b=hqo+W/SO8qs/Q2yHTRN39dKyMfMm8Cf78arjcz/Zi4QdRd2vYMzP9w676MpXeOdXlO04x3 DPWqi9XAhRAcAfwdI9Yp2P6qOIYEQBuzgQEY+4dVSl1R+h8yR7Wu4xlwbI7gqjzUX0fV37 HKzxeNV8YFikAKZ/38hYssahqlCNkRxqUOJzAQmmDHEEdHXfuq9hUhO8ijm9OUT1Hrwu7y 5MkOrANgpXP1XL7yL1dWithkcSdvrsRn3DSKmaPfu8p2mSnv7LpNooIyuMdgXnZQMWpmtQ tNyGbjL3ApvMZlM892Nawe/MXYuOq3wicekPaATPRz9O2/FGZ7CRYSRpoajiBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705938565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=212154dIxDoYbSClHorq1WRpuYpdQSU2lnPwvPZ6UVE=; b=FD/oP2cDOWxbCj+UNti93O12PzzL2kolXRTtCtGrWU6D+3SSgo9g2q95jCOWV8PojktlXj azftgOF/T9G0ghyQ3H22+VLyK+pwWomo6jCqhPE1mVRgDLvSqyG1nakQ7KFJXCPnql+KFP AQ/10eFRp1YAWVDMXdwVkynq9oNi1n6ANClPo8F1X3+ulACETdmxXThOYF+C/8f3lUGtQZ aH5w9o6xbENCRjBt5F37GiRLcv9O0OrP3tWE/cGVIK8BoQnMaVFssiVh4RTYkUQgW+0Ejj 3ebFjqz/bOd/j8xegtKqRnV6LM31+Ln3/aAGIG8eurREJIjDaFQ10v0JVqZZzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705938565; a=rsa-sha256; cv=none; b=fnDxlwCG0Xa9yVx/A0Fo+CGlZJz0u1fWZ47nydZWvEj85JpK77fdFtRqivxXq9MmJV76lw g93kvG2lDFQzoUcrNTJzX4lliA/pBs+q4RoOkP1bMnWbd2Fn1HiKtjwIdAv1hb4OtVx24l iQUFoFjw+B6+IXT0NVHTGZc5fZUPtff5wHuS24f5WYVdAKRqL3LMu9ixatA+w2dboab5tH 7qFB+aPI5RgRImPJaZ8dgVS7gAjNXJo8HwaIILvn9zrKd4PV0qpSfAx9tF2adH73d6sBCT HLFQi5Uv97GAtpPIpZp3YPrm7VkVSqxgqj0+Pr58frm3CAGyy3dPvjXEHu8Urg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJZQr6XG8z17HY; Mon, 22 Jan 2024 15:49: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 40MFnOie034985; Mon, 22 Jan 2024 15:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MFnOoH034982; Mon, 22 Jan 2024 15:49:24 GMT (envelope-from git) Date: Mon, 22 Jan 2024 15:49:24 GMT Message-Id: <202401221549.40MFnOoH034982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: c7db2e15e404 - stable/14 - kerberos: Fix numerous segfaults when using weak crypto List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c7db2e15e4045e1daba939bb151fc5878f791c7b Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c7db2e15e4045e1daba939bb151fc5878f791c7b commit c7db2e15e4045e1daba939bb151fc5878f791c7b Author: Cy Schubert AuthorDate: 2023-12-06 15:30:05 +0000 Commit: Cy Schubert CommitDate: 2024-01-22 15:48:51 +0000 kerberos: Fix numerous segfaults when using weak crypto Weak crypto is provided by the openssl legacy provider which is not load by default. Load the legacy providers as needed. When the legacy provider is loaded into the default context the default provider will no longer be automatically loaded. Without the default provider the various kerberos applicaions and functions will abort(). This is the second attempt at this patch. Instead of linking secure/lib/libcrypto at build time we now link it at runtime, avoiding buildworld failures under Linux and MacOS. This is because TARGET_ENDIANNESS is undefined at pre-build time. PR: 272835 Tested by: netchild Joerg Pulz (previous version) (cherry picked from commit 476d63e091c2e663b51d18acf6acb282e1f22bbc) --- crypto/heimdal/lib/kadm5/create_s.c | 4 ++ crypto/heimdal/lib/kadm5/kadm5_locl.h | 1 + crypto/heimdal/lib/krb5/context.c | 4 ++ crypto/heimdal/lib/krb5/crypto.c | 3 + crypto/heimdal/lib/krb5/salt.c | 5 ++ crypto/heimdal/lib/roken/version-script.map | 1 + kerberos5/include/crypto-headers.h | 4 ++ kerberos5/include/fbsd_ossl_provider.h | 4 ++ kerberos5/lib/libroken/Makefile | 8 ++- kerberos5/lib/libroken/fbsd_ossl_provider_load.c | 77 ++++++++++++++++++++++++ 10 files changed, 109 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/kadm5/create_s.c b/crypto/heimdal/lib/kadm5/create_s.c index 1033ca103239..267e9bbda2a0 100644 --- a/crypto/heimdal/lib/kadm5/create_s.c +++ b/crypto/heimdal/lib/kadm5/create_s.c @@ -169,6 +169,10 @@ kadm5_s_create_principal(void *server_handle, ent.entry.keys.len = 0; ent.entry.keys.val = NULL; + ret = fbsd_ossl_provider_load(); + if (ret) + goto out; + ret = _kadm5_set_keys(context, &ent.entry, password); if (ret) goto out; diff --git a/crypto/heimdal/lib/kadm5/kadm5_locl.h b/crypto/heimdal/lib/kadm5/kadm5_locl.h index 68b6a5ebf024..63b367ab7e21 100644 --- a/crypto/heimdal/lib/kadm5/kadm5_locl.h +++ b/crypto/heimdal/lib/kadm5/kadm5_locl.h @@ -79,5 +79,6 @@ #include #include #include "private.h" +#include "fbsd_ossl_provider.h" #endif /* __KADM5_LOCL_H__ */ diff --git a/crypto/heimdal/lib/krb5/context.c b/crypto/heimdal/lib/krb5/context.c index 86bfe539b974..681bc9a0982f 100644 --- a/crypto/heimdal/lib/krb5/context.c +++ b/crypto/heimdal/lib/krb5/context.c @@ -392,6 +392,10 @@ krb5_init_context(krb5_context *context) } HEIMDAL_MUTEX_init(p->mutex); + ret = fbsd_ossl_provider_load(); + if(ret) + goto out; + p->flags |= KRB5_CTX_F_HOMEDIR_ACCESS; ret = krb5_get_default_config_files(&files); diff --git a/crypto/heimdal/lib/krb5/crypto.c b/crypto/heimdal/lib/krb5/crypto.c index 67ecef62e875..6ee22609a4d5 100644 --- a/crypto/heimdal/lib/krb5/crypto.c +++ b/crypto/heimdal/lib/krb5/crypto.c @@ -2054,6 +2054,9 @@ krb5_crypto_init(krb5_context context, *crypto = NULL; return ret; } + ret = fbsd_ossl_provider_load(); + if (ret) + return ret; (*crypto)->key.schedule = NULL; (*crypto)->num_key_usage = 0; (*crypto)->key_usage = NULL; diff --git a/crypto/heimdal/lib/krb5/salt.c b/crypto/heimdal/lib/krb5/salt.c index 5e4c8a1c8572..2b1fbee80ab6 100644 --- a/crypto/heimdal/lib/krb5/salt.c +++ b/crypto/heimdal/lib/krb5/salt.c @@ -43,6 +43,8 @@ krb5_salttype_to_string (krb5_context context, struct _krb5_encryption_type *e; struct salt_type *st; + (void) fbsd_ossl_provider_load(); + e = _krb5_find_enctype (etype); if (e == NULL) { krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP, @@ -75,6 +77,8 @@ krb5_string_to_salttype (krb5_context context, struct _krb5_encryption_type *e; struct salt_type *st; + (void) fbsd_ossl_provider_load(); + e = _krb5_find_enctype (etype); if (e == NULL) { krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP, @@ -196,6 +200,7 @@ krb5_string_to_key_data_salt_opaque (krb5_context context, enctype); return KRB5_PROG_ETYPE_NOSUPP; } + (void) fbsd_ossl_provider_load(); for(st = et->keytype->string_to_key; st && st->type; st++) if(st->type == salt.salttype) return (*st->string_to_key)(context, enctype, password, diff --git a/crypto/heimdal/lib/roken/version-script.map b/crypto/heimdal/lib/roken/version-script.map index 72d2ea7e4f7c..bb2139ed74cc 100644 --- a/crypto/heimdal/lib/roken/version-script.map +++ b/crypto/heimdal/lib/roken/version-script.map @@ -13,6 +13,7 @@ HEIMDAL_ROKEN_1.0 { ct_memcmp; err; errx; + fbsd_ossl_provider_load; free_getarg_strings; get_default_username; get_window_size; diff --git a/kerberos5/include/crypto-headers.h b/kerberos5/include/crypto-headers.h index 3ae0d9624ffd..2cc870642964 100644 --- a/kerberos5/include/crypto-headers.h +++ b/kerberos5/include/crypto-headers.h @@ -17,5 +17,9 @@ #include #include #include +#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) +#include +#include "fbsd_ossl_provider.h" +#endif #endif /* __crypto_headers_h__ */ diff --git a/kerberos5/include/fbsd_ossl_provider.h b/kerberos5/include/fbsd_ossl_provider.h new file mode 100644 index 000000000000..013983ca9f83 --- /dev/null +++ b/kerberos5/include/fbsd_ossl_provider.h @@ -0,0 +1,4 @@ +#ifndef __fbsd_ossl_provider_h +#define __fbsd_ossl_provider_h +int fbsd_ossl_provider_load(void); +#endif diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index 0c46ba6c4cb5..ca6d090e64f0 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -74,9 +74,13 @@ SRCS= base64.c \ vis.c \ warnerr.c \ write_pid.c \ - xfree.c + xfree.c \ + fbsd_ossl_provider_load.c -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${SRCTOP}/kerberos5/include \ + -I${KRB5DIR}/lib/krb5 \ + -I${SRCTOP}/crypto/openssl/include -I. CLEANFILES= roken.h diff --git a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c new file mode 100644 index 000000000000..497b32124f96 --- /dev/null +++ b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c @@ -0,0 +1,77 @@ +#include +#include +#include +#include +#include + +#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) +static void fbsd_ossl_provider_unload(void); +static void print_dlerror(char *); +static OSSL_PROVIDER *legacy; +static OSSL_PROVIDER *deflt; +static int providers_loaded = 0; +static OSSL_PROVIDER * (*ossl_provider_load)(OSSL_LIB_CTX *, const char*) = NULL; +static int (*ossl_provider_unload)(OSSL_PROVIDER *) = NULL; +static void *crypto_lib_handle = NULL; + +static void +fbsd_ossl_provider_unload(void) +{ + if (ossl_provider_unload == NULL) { + if (!(ossl_provider_unload = (int (*)(OSSL_PROVIDER*)) dlsym(crypto_lib_handle, "OSSL_PROVIDER_unload"))) { + print_dlerror("Unable to link OSSL_PROVIDER_unload"); + return; + } + } + if (providers_loaded == 1) { + (*ossl_provider_unload)(legacy); + (*ossl_provider_unload)(deflt); + providers_loaded = 0; + } +} + +static void +print_dlerror(char *message) +{ + char *errstr; + + if ((errstr = dlerror()) != NULL) + fprintf(stderr, "%s: %s\n", + message, errstr); +} +#endif + +int +fbsd_ossl_provider_load(void) +{ +#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) + if (crypto_lib_handle == NULL) { + if (!(crypto_lib_handle = dlopen("/usr/lib/libcrypto.so", + RTLD_LAZY|RTLD_GLOBAL))) { + print_dlerror("Unable to load libcrypto.so"); + return (EINVAL); + } + } + if (ossl_provider_load == NULL) { + if (!(ossl_provider_load = (OSSL_PROVIDER * (*)(OSSL_LIB_CTX*, const char *)) dlsym(crypto_lib_handle, "OSSL_PROVIDER_load"))) { + print_dlerror("Unable to link OSSL_PROVIDER_load"); + return(ENOENT); + } + } + + if (providers_loaded == 0) { + if ((legacy = (*ossl_provider_load)(NULL, "legacy")) == NULL) + return (EINVAL); + if ((deflt = (*ossl_provider_load)(NULL, "default")) == NULL) { + (*ossl_provider_unload)(legacy); + return (EINVAL); + } + if (atexit(fbsd_ossl_provider_unload)) { + fbsd_ossl_provider_unload(); + return (errno); + } + providers_loaded = 1; + } +#endif + return (0); +} From nobody Mon Jan 22 16:23:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJb9y3HC9z57k54; Mon, 22 Jan 2024 16:23: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 4TJb9y2psGz4TWw; Mon, 22 Jan 2024 16:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705940598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UEIaP0R/JUz9BY+FX86TFZE9V1Tyb+BZ+HBGaHGBKSY=; b=reQETbBd8TJpuEPdvRkPUfWllehqazuWAg28Y4o/U1E3FHO4viK5yJt36LL2TNbHzccbYg rb0kl4U8TIV+3OlMjDXDHZ6jrT4RNxvzTJdVwXCfkJ7Vq4FPNYZQKv4Tzg/yYV3L8Tz+aX NpA2AU6j6RDU0trnEooq08qJyXMQus9iKu+qd6RGFjGgH+GoXUNeQ+nmGUazSgkJnJ6fdf ozx2HTwm30neJNH+h5spunA01hsh/QjrTjFo0P0isxGGTRTYQBSy3YIHlUs+ty5OAhN3wQ xx+sgXhNVke4+gdjgadelHzcr5IGWMBH3cB8Vp7tN0fnukbIchVAGqd+WCKZhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705940598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UEIaP0R/JUz9BY+FX86TFZE9V1Tyb+BZ+HBGaHGBKSY=; b=CFFTqQbSPHPXP8KMCV8Pnv+uP8PweTf8IVj4hRWfv5LHOQ52RkKusECx0S9oy7ztSUW00s J1TM0Sahnn48LyyC+4CQfQBlkrv72pLfhLnXnpyzkFsqYAikrSmogRCDFkeK7oDWrL8/sQ jvhT1l9BnrXEzILJq75y2aiUYajHlL1V6uEaR5GINsAwEOjqGM2ABYui9oPV4tU+t4Q2Xo aeY81joA4Jp077DISm8VNkATZl5TQ7xUIqPwYRjSyCJQ7AHSC4wjoAiWubJInvqnAn2agR Refk8V/Lmdto9qh7CkRVSR2o72nwZnd5jlxv62aeXIAbyt23YxLNrEuKMHYVEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705940598; a=rsa-sha256; cv=none; b=KpjPFsAkLW/qkKgTJpdU4ywfZ9ZH5f0OrB4kisQptrS66EgrjCBT6pJOcd/CCzMuLcb2vv omxDWuZg1bcKb9YWVuH0MeIpk7v0SjITgUYj/0/IR01+fhhIZBKF9Aqs4Onz57QyvJoBDV MbP/WLW0HWzVIVSKSr/T92GP0tfRkMcPdP6iJHkMf1/rRUWFuWb/EMekEbtRpEmsGru/nm GtL3z1/cSdHuqXc9leKOvfoYbQrtYUhsQXxXwfoS6PTuLa/bkHOWzded8+EQjk/mGXtmrl u4CUfutMjtTPZDRz6YSLgp81RDfeYrdzJ0KOXNPKvw7EjuWm//dKwNSmk50Xcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJb9y1tFLz18Gc; Mon, 22 Jan 2024 16:23:18 +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 40MGNI7I002558; Mon, 22 Jan 2024 16:23:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MGNIo7002555; Mon, 22 Jan 2024 16:23:18 GMT (envelope-from git) Date: Mon, 22 Jan 2024 16:23:18 GMT Message-Id: <202401221623.40MGNIo7002555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 43be2d7aaf25 - main - wg: detach bpf upon destroy as well List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43be2d7aaf25b719aec8f49aab110c0061f1edec Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=43be2d7aaf25b719aec8f49aab110c0061f1edec commit 43be2d7aaf25b719aec8f49aab110c0061f1edec Author: Aaron LI AuthorDate: 2024-01-22 16:18:56 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 16:22:44 +0000 wg: detach bpf upon destroy as well bpfattach() is called in wg_clone_create(), but the bpfdetach() is missing from wg_close_destroy(). Add the missing bpfdetach() to avoid leaking both the associated bpf bits as well as the ifnet that bpf will hold a reference to. PR: 276526 MFC after: 3 days --- sys/dev/wg/if_wg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 58c0e2db1ee8..c7649e2b4059 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2876,6 +2876,7 @@ wg_clone_destroy(struct if_clone *ifc, if_t ifp, uint32_t flags) if (cred != NULL) crfree(cred); + bpfdetach(sc->sc_ifp); if_detach(sc->sc_ifp); if_free(sc->sc_ifp); From nobody Mon Jan 22 16:24:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJbCW0S3Tz57k7L; Mon, 22 Jan 2024 16:24: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 4TJbCV6lXJz4Vbd; Mon, 22 Jan 2024 16:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705940679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qW6YpP61NxaWh8RCYEYmTYnSd1Be5AfGYMF+D0tg3m0=; b=WSWnDyDxgWS0fLrip46F+cAv2Cke6JZZ6AqetghuACQQHbbR1vhalxrgIp5B4vpkArF+IM ePFJZ475TU8CFeAbloLo9J9lRsMgL0UW/kkTQCjGDOhHtR0AV74M4rboTeBFKe6/A6CieO iYBK3WD6ywtY+h8VzaNzwl8jtttGfwnQsc09jSg7lvjY0ZcJ7z6MWkec9aQZH/cKFGWJOw ACQWs4+xtkmg67fIy9jas1KVsui1p5T2Fya4UgfB8/tKsp4zkiZiiwIHqlItVWSTyG9adv ZUa4bAP0y/KLrvGvwdp9KbHll2DrvVTyL78DJDDQHycXxbnyEFSV4ndHRmHaCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705940678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qW6YpP61NxaWh8RCYEYmTYnSd1Be5AfGYMF+D0tg3m0=; b=scPJ+kQ/S1gwXUjjMDGFAhfGO6e1nGcH2GUJfGZj656+B700179Mu/TUXjZeAVgnb4UYFD uhMw4jEPSEhag41TdrbXXGunr2VO0pT2IfFHXeuqClAydkfi6FKVKxqPNt8XGlVcvZfVTD T+mKd8ZVyCtFqOaQZTh7CXuQs+EKHFXTY8v83lCzR8U7C2Y1ckw4i7RkqkJ9c5ITPLDZRP HgUi0wJvAOGb7jHMp2u2LekZ6IftVaTK8BSuDD8wFExojm/c+ivluO+Ml4+FSYcV8qzpRd huCxoBpRb8NnRfJVk913rKWaFzd9dMF4JElDoYQmCPAqfsPbM8Sf0tUbYjyUzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705940679; a=rsa-sha256; cv=none; b=GEl/TzlT8Iue2meU1LxukyHtosTQOF7NDeQ3/ahfKzzfuL/ruPuIusc9Rjk8AsYZE3VklR Y9YYuaxVpL+NGNwmyWu6/1iy0I003l9rWXsGNw2WngOn9tr9t1Opp/OaTO5fpXKcH7f//W 7F/1GoJP7agoXrxbOQH5TY/JNU5GTx31JZ5XncML330eCOKkD68h68Pz4WW4//abViRI2m HIxte6nRZQ02ID0DjXNy4hwkTDO2Z/9BnFEEs0e7dxjrP7M6Y0ReYVc3ael5THOxufGnrs JXRC33xjqBnL3sK5Te/ourmpmCrn9Ee0kVBvEIRK70B8eLkbm4xPRp9QO7u3yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJbCV5n6gz186g; Mon, 22 Jan 2024 16:24: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 40MGOc8p002873; Mon, 22 Jan 2024 16:24:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MGOcwP002870; Mon, 22 Jan 2024 16:24:38 GMT (envelope-from git) Date: Mon, 22 Jan 2024 16:24:38 GMT Message-Id: <202401221624.40MGOcwP002870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 8297ff13fb60 - main - tcp_wrappers: silence a few warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8297ff13fb604c86797e6a66bc654caff2cf3ce2 Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=8297ff13fb604c86797e6a66bc654caff2cf3ce2 commit 8297ff13fb604c86797e6a66bc654caff2cf3ce2 Author: Piotr Paweł Stefaniak AuthorDate: 2024-01-21 10:15:48 +0000 Commit: Piotr Paweł Stefaniak CommitDate: 2024-01-22 16:23:49 +0000 tcp_wrappers: silence a few warnings Mostly -Wdeprecated-non-prototype. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43531 --- contrib/tcp_wrappers/options.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/contrib/tcp_wrappers/options.c b/contrib/tcp_wrappers/options.c index 481ba2d372d5..26e98db8ed95 100644 --- a/contrib/tcp_wrappers/options.c +++ b/contrib/tcp_wrappers/options.c @@ -76,20 +76,20 @@ static char *chop_string(char *string); /* strip leading and trailing blanks */ /* List of functions that implement the options. Add yours here. */ -static void user_option(); /* execute "user name.group" option */ -static void group_option(); /* execute "group name" option */ -static void umask_option(); /* execute "umask mask" option */ -static void linger_option(); /* execute "linger time" option */ -static void keepalive_option(); /* execute "keepalive" option */ -static void spawn_option(); /* execute "spawn command" option */ -static void twist_option(); /* execute "twist command" option */ -static void rfc931_option(); /* execute "rfc931" option */ -static void setenv_option(); /* execute "setenv name value" */ -static void nice_option(); /* execute "nice" option */ -static void severity_option(); /* execute "severity value" */ -static void allow_option(); /* execute "allow" option */ -static void deny_option(); /* execute "deny" option */ -static void banners_option(); /* execute "banners path" option */ +static void user_option(char *, struct request_info *); /* user name.group */ +static void group_option(char *, struct request_info *); /* group name */ +static void umask_option(char *, struct request_info *); /* umask mask */ +static void linger_option(char *, struct request_info *); /* linger time */ +static void keepalive_option(char *, struct request_info *); /* keepalive */ +static void spawn_option(char *, struct request_info *); /* spawn command */ +static void twist_option(char *, struct request_info *); /* twist command */ +static void rfc931_option(char *, struct request_info *); /* rfc931 */ +static void setenv_option(char *, struct request_info *); /* setenv name value */ +static void nice_option(char *, struct request_info *); /* nice */ +static void severity_option(char *, struct request_info *); /* severity value */ +static void allow_option(char *, struct request_info *); /* allow */ +static void deny_option(char *, struct request_info *); /* deny */ +static void banners_option(char *, struct request_info *); /* banners path */ /* Structure of the options table. */ @@ -197,9 +197,7 @@ void process_options(char *options, struct request_info *request) /* ARGSUSED */ -static void allow_option(value, request) -char *value; -struct request_info *request; +static void allow_option(char *value, struct request_info *request) { longjmp(tcpd_buf, AC_PERMIT); } @@ -208,9 +206,7 @@ struct request_info *request; /* ARGSUSED */ -static void deny_option(value, request) -char *value; -struct request_info *request; +static void deny_option(char *value, struct request_info *request) { longjmp(tcpd_buf, AC_DENY); } @@ -250,7 +246,6 @@ static void banners_option(char *value, struct request_info *request) static void group_option(char *value, struct request_info *request) { struct group *grp; - struct group *getgrnam(); if ((grp = getgrnam(value)) == 0) tcpd_jump("unknown group: \"%s\"", value); @@ -267,7 +262,6 @@ static void group_option(char *value, struct request_info *request) static void user_option(char *value, struct request_info *request) { struct passwd *pwd; - struct passwd *getpwnam(); char *group; if ((group = split_at(value, '.')) != 0) From nobody Mon Jan 22 16:42:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJbcL1mNSz57lm4; Mon, 22 Jan 2024 16:42: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 4TJbcL1K88z4Wrv; Mon, 22 Jan 2024 16:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705941762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVRvYRmra4qQ8IfNq5HvmJsigMkJVYVnXsEB+ElWnAo=; b=G3wBK942Imz9TRsHVu0+XnL7gDP7GAoIriMPYavtCdUsUm9BkyupCAHqyYROw37JXm6XaP LmMp+rKo5cB1PsQDGq1iAEGL8KESmmTB3aCY/rFkAQNLdVoRKSeAejviPMD0D0VIg9k8Bp vJ4tsyrw4r7T9W727jXPGIuam0V17nMM4Jxw6o2vZpHDHXef5BiKIG+w6c2Y9+B+BM3m81 1vt+rqTuedmoDxttgDn/AqrtiG6epB+MImFnhA8330WbgdSAxR2JvHpIC8jLrFroqFbV8O Ha3qvST4G6kEVcaiVoRNC3FMb+TlF/PQV7K8GKwS8qJvbiTk7ZvIU6CbI1TT8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705941762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVRvYRmra4qQ8IfNq5HvmJsigMkJVYVnXsEB+ElWnAo=; b=EAlKdc0RjZl+DG5pLcTCw3B739IdfNOPJQexk8AhKzVJocZvgp6BIZm2/pRE2XEHqFgi4J 3L9nrKzrDpE4M4xDuYmvgDwT1Oxzu6fvV0aVxXQMKESDfF2/bXlipuoN4JmgxyUSVdicEV lf29gtH54861opBYez4bV7Dk15OM6Z0tEvvmAs3jsQCQHv8h7ZmOnprZHGpIm0kP/CBU8Z f2uUhwwDdYEMkiJBry3VxUh8XiqDNFgcYXFE5pZJ36wskjnuZxgn5qBWWapSIowEOlFBmT 7OWULukIPw6viP8ZDjIdTBFzBX+frq87H2KTCOU7TTJnl0mPdOLWt5YhLtLUbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705941762; a=rsa-sha256; cv=none; b=r8AKkpXwqdICuAgiQj6XKILJJadslZAOo8GxY1KnD9WmeXGnc8eqjVLVTBeEeWXWvp+ZbQ hl0+qZCDAccO+LFJMbuQQlYRq7BIEiH2KOO48ht3jhxmx2/OJWMM2wIu1/eff6W2DuVmdz gfnRWmFuZIWTcFn20A62GsYMRsPgp0ZJWpqOA6ZaVg2f7LD9Acs351TgCIGOTNDr1SQQq1 ZajAU9m235wEuGKGN/w0oo0ZPNx9ymwcJ4NavzWrqmGRjEORJv9oT3M357rdizoBNxaGKu RTzvBtEEB2jogxT3AT96/x9VNDfxY4B7cTzyVq4IcT3JF6/8bDsfzEHDNZ2ctw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJbcL0N5Jz18bT; Mon, 22 Jan 2024 16:42: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 40MGgfb9036354; Mon, 22 Jan 2024 16:42:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MGgfS5036351; Mon, 22 Jan 2024 16:42:41 GMT (envelope-from git) Date: Mon, 22 Jan 2024 16:42:41 GMT Message-Id: <202401221642.40MGgfS5036351@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: 7e88d8fec4e8 - stable/14 - route: error on IPv4 network routes with incorrect destination List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 7e88d8fec4e8adc258378c7a68adf6cef1da8ad4 Auto-Submitted: auto-generated The branch stable/14 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=7e88d8fec4e8adc258378c7a68adf6cef1da8ad4 commit 7e88d8fec4e8adc258378c7a68adf6cef1da8ad4 Author: Mike Karels AuthorDate: 2024-01-15 21:14:54 +0000 Commit: Mike Karels CommitDate: 2024-01-22 16:42:16 +0000 route: error on IPv4 network routes with incorrect destination Route destinations like 10/8 are most likely intended as a shorthand for 10.0.0.0/8, but instead it means 0.0.0.10/8, which includes only bits in the host part of the mask, and hence adds a route to 0.0.0.0/8. In 12.x, there was code to "do what I mean", which was removed as part of a cleanup of old network class remnants. Given that we have gone this long without that code, do not restore that behavior. Instead, detect the issue and produce an error. Specifically, if there are no dots in a numeric IPv4 address, the mask is specified with CIDR notation (using a slash), and there are bits set in the host part, produce an error like this for 10/8: route: malformed address, bits set after mask; 10 means 0.0.0.10 PR: 258874 Reviewed by: melifaro, emaste Differential Revision: https://reviews.freebsd.org/D43384 (cherry picked from commit b9e8ae1d8a424194b4e185359da4ded163f24f4e) --- sbin/route/route.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sbin/route/route.c b/sbin/route/route.c index 3913bdc9e6af..7cf2bf842559 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1342,6 +1342,9 @@ getaddr(int idx, char *str, int nrflags) q = strchr(str,'/'); if (q != NULL && idx == RTAX_DST) { /* A.B.C.D/NUM */ + struct sockaddr_in *mask; + uint32_t mask_bits; + *q = '\0'; if (inet_aton(str, &sin->sin_addr) == 0) errx(EX_NOHOST, "bad address: %s", str); @@ -1351,6 +1354,20 @@ getaddr(int idx, char *str, int nrflags) errx(EX_NOHOST, "bad mask length: %s", q + 1); inet_makemask((struct sockaddr_in *)&so[RTAX_NETMASK],masklen); + + /* + * Check for bogus destination such as "10/8"; heuristic is + * that there are bits set in the host part, and no dot + * is present. + */ + mask = ((struct sockaddr_in *) &so[RTAX_NETMASK]); + mask_bits = ntohl(mask->sin_addr.s_addr); + if ((ntohl(sin->sin_addr.s_addr) & ~mask_bits) != 0 && + strchr(str, '.') == NULL) + errx(EX_NOHOST, + "malformed address, bits set after mask;" + " %s means %s", + str, inet_ntoa(sin->sin_addr)); return (0); } if (inet_aton(str, &sin->sin_addr) != 0) From nobody Mon Jan 22 16:43:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJbcl2fWMz57lW4; Mon, 22 Jan 2024 16:43: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 4TJbcl27L8z4XCJ; Mon, 22 Jan 2024 16:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705941783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2TUt0mu4Gghk0b6KyQ1GwtXeUCDCgbWI/pOP5AydS/A=; b=KvzP+c+Es/YsAlznrbkeROfU9RBLWjqewZLn8ME0WrgSvFP1BrdLFgFzOYQyYe+g256jHv MpYOsrVORrnPGSG/9xpSmon1ZjIP3cJCgL4CQwvmACDt2GSX5XbNsQ8barHUWtgFhJQVVf 7OGxFeK2YU7QodDyEX+jsP/Y1sGMqgr1o3pEO/It1ft0+fpLHZbLIQoOas2Q8o197hXPDZ ng5ehaEQ7TaY9vNWZ7UtVSjVfVwoHhG5w3rYC0a7BCTO2b5dtjejpnYLg/ulieI5aMFCyR AriRsGNMQR4Zc1mQGCspEXEncmmbrGsEFblgGaayunZ3VRXHuj8xLoTDuJztZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705941783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2TUt0mu4Gghk0b6KyQ1GwtXeUCDCgbWI/pOP5AydS/A=; b=NrHoHa/8Qxd28AmBlGGINO/ibEbCnWIpbPIdJTGX3aQ3vIDDRyuAOH/lTAuPezHQrWQdHq XVnMcISpaPV0lnlmpophOwI+UJqHdKcRd8VGN0QyyMeIscl2q85ws76aUj5a6HSosTPpS/ FqAmJkTZBgJpaOrMNbKZOgOny5ZndIH4HSB85jUaZu1GhmLDmav0d4V1adi/1A7Ufvdksj u2aAjkip8vvcFwH20C5CrPXHryPg2uK8KHJhC5wAffqJjg4ENUGgUGJyo0tdPIbPVio/eV jqqDNtqpGkb5qZIX6DWm0MEGYN9OhYOwF3UADRtz37xdUrpDdLE7bBI48VIhSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705941783; a=rsa-sha256; cv=none; b=A73XaEoXXN+jKmHn61jz2I7boMBlap9LGHPnxbK4ecyg541z6WPM2takcDOkfXvvOxkCaU hA4Hkbb9c25KanqyuUlX+IW10/sO1UiQ3sSGi6/YfXyqA2eVXi3+vRZ7fD8j4fHh8KXIAP a23jCQ25mNuZgctLm02TRZzBiRcs4KCd2hvHqNrw5AplI8D+S4mXCfh3uFP4HSxLDru9Ag wg/91DTrAM4t6RjXLmSVaUvpki0Ci+BdyLnQ6Sx+vGPrOB/wY169bo2J6IkGE2SIR795/U y0jqZeQmVuH2tDXx9dFXJjzBj84aNFBESNPyPYal0fW6jzld++7F1wnLalSLjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJbcl1BRZz18Xy; Mon, 22 Jan 2024 16:43: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 40MGh3GM036562; Mon, 22 Jan 2024 16:43:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MGh3Qq036559; Mon, 22 Jan 2024 16:43:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 16:43:03 GMT Message-Id: <202401221643.40MGh3Qq036559@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: 74e52718aa73 - stable/13 - route: error on IPv4 network routes with incorrect destination List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 74e52718aa737deb2477350b16697def98259836 Auto-Submitted: auto-generated The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=74e52718aa737deb2477350b16697def98259836 commit 74e52718aa737deb2477350b16697def98259836 Author: Mike Karels AuthorDate: 2024-01-15 21:14:54 +0000 Commit: Mike Karels CommitDate: 2024-01-22 16:42:52 +0000 route: error on IPv4 network routes with incorrect destination Route destinations like 10/8 are most likely intended as a shorthand for 10.0.0.0/8, but instead it means 0.0.0.10/8, which includes only bits in the host part of the mask, and hence adds a route to 0.0.0.0/8. In 12.x, there was code to "do what I mean", which was removed as part of a cleanup of old network class remnants. Given that we have gone this long without that code, do not restore that behavior. Instead, detect the issue and produce an error. Specifically, if there are no dots in a numeric IPv4 address, the mask is specified with CIDR notation (using a slash), and there are bits set in the host part, produce an error like this for 10/8: route: malformed address, bits set after mask; 10 means 0.0.0.10 PR: 258874 Reviewed by: melifaro, emaste Differential Revision: https://reviews.freebsd.org/D43384 (cherry picked from commit b9e8ae1d8a424194b4e185359da4ded163f24f4e) --- sbin/route/route.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sbin/route/route.c b/sbin/route/route.c index c0452e71811e..c48a39b490dd 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1309,6 +1309,9 @@ getaddr(int idx, char *str, int nrflags) q = strchr(str,'/'); if (q != NULL && idx == RTAX_DST) { /* A.B.C.D/NUM */ + struct sockaddr_in *mask; + uint32_t mask_bits; + *q = '\0'; if (inet_aton(str, &sin->sin_addr) == 0) errx(EX_NOHOST, "bad address: %s", str); @@ -1318,6 +1321,20 @@ getaddr(int idx, char *str, int nrflags) errx(EX_NOHOST, "bad mask length: %s", q + 1); inet_makemask((struct sockaddr_in *)&so[RTAX_NETMASK],masklen); + + /* + * Check for bogus destination such as "10/8"; heuristic is + * that there are bits set in the host part, and no dot + * is present. + */ + mask = ((struct sockaddr_in *) &so[RTAX_NETMASK]); + mask_bits = ntohl(mask->sin_addr.s_addr); + if ((ntohl(sin->sin_addr.s_addr) & ~mask_bits) != 0 && + strchr(str, '.') == NULL) + errx(EX_NOHOST, + "malformed address, bits set after mask;" + " %s means %s", + str, inet_ntoa(sin->sin_addr)); return (0); } if (inet_aton(str, &sin->sin_addr) != 0) From nobody Mon Jan 22 17:30:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfw48fGz57r9r; Mon, 22 Jan 2024 17:30: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 4TJcfw3G4nz4fR6; Mon, 22 Jan 2024 17:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kmGzaSASlQXsIeCbZigD8D6l56u1wFa0HJ5PJY6FVxk=; b=kauRvwO0Oh1W39Uk1eslFjR44D72o3cSx1S1u2V8C+KyI3+ErTANCbQBpXH3y7KOTwUEG2 6X3dJQrjn9VmM6ydUMkdKmpa2Fb15K6FjLpKFmlLoVUowtBahZI/7C2o7lF8E6LzTXWpMd ZDhA1fNCZrjuRjer59U7c+gcQ9JDCd1e9m7R17s0rvlcxLn1xqn8leti6O7sONF7aCOfix YDM0pkmn3Q7I1++50l7WTTVlUEg8J17CnodrFtBcxQbaoS6rr/StBge3Io7mKyZNiRUwKC 0jszFzLQgpNClqKgpoT08PR0O8F9TGzuKD4j1sqQKbbdaPMY983V+DfUFq7cEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kmGzaSASlQXsIeCbZigD8D6l56u1wFa0HJ5PJY6FVxk=; b=blMKL8sU9PZZuemhmx4i7oVtK5SaKIkWG782VY3q95lypYffJvVdlYf5L69GN6B2qSf0D5 naH/YAQpO04qwA2scfhZRIH5vj1+565w+P1qlPZ2z+z9/aoMX+c/pJTstGnxzTfV7+zBVn gHO31uBaiqxHxQQ7m6jJalz/LDYdZHti3mOhrF5dbb1a4Cl/L6m+rjBL/id5emYpSdPmgG D3bO7m5RYaoOpqJqbuq5eftDlnJlTCslRUXmWRgq0VqfqSRy6wPRY2WG6Zow78zB7OgdZE gLmS0YETPKX/rn56uO37i9uGkTHhV3/oLcl1tEkjw9lqrt/KxWUovHv3CfZMjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944600; a=rsa-sha256; cv=none; b=IO0bU0hhrIqnh75vxgn5fU3mLUZObvGA90sDey3M1Dlu0nPLJf6cRTme40e6J+aiY0GPx4 FhozhaGAUcU+XaqACxD0vp2dYwojZxwMcBp9GNk3Vk748gDAElMbVikj49/kWU6toaA1tF BHbiIMzVcMYEkt4r4jVfcEEVs+N+E+xxmeb9+wtvufSjDQ7HUlSkqCNC4J1jCdcIUJ/BAG jIZ2YQeKdF3b+RQTJAKMYZaTLqve6/G9oiH77zcc0PNcr4Wesm/XBeNwnG/c75QqYJOsnb SxA8znG65/OVBg6ex0VuLeDW8HBkBPMdgB0eZ2O6hOTR6AqbkXW7NrPBgGQjcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfw2K2gz19pB; Mon, 22 Jan 2024 17:30: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 40MHU0mg006500; Mon, 22 Jan 2024 17:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU0o9006475; Mon, 22 Jan 2024 17:30:00 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:00 GMT Message-Id: <202401221730.40MHU0o9006475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3299277af825 - stable/14 - bhyveload: hold /boot and do relative lookups for the loader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3299277af8257c4a1cd59b3d813fcacbbe358ca9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3299277af8257c4a1cd59b3d813fcacbbe358ca9 commit 3299277af8257c4a1cd59b3d813fcacbbe358ca9 Author: Kyle Evans AuthorDate: 2024-01-03 22:17:59 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:18:37 +0000 bhyveload: hold /boot and do relative lookups for the loader The next change will push bhyveload into capability mode right after we allocate vcpu state, before we've setup or entered the loader, to limit the surface area that a rogue loader script can touch. With an explicit -l loader, we don't need to preopen /boot because changing interpreters isn't allowed. We'll just dlopen() entirely in advance in that case to eliminate some complexity. Reviewed by: allanjude (earlier version), markj (cherry picked from commit bf7c4fcbbb05ff99afde0744d013feeb35d77191) (cherry picked from commit 67082f077f39d9c7b7bd561c14622e6f3ef23681) --- usr.sbin/bhyveload/bhyveload.c | 73 +++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 4c1dbd583e1f..7503598ba94b 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -94,11 +94,9 @@ static int ndisks; static int consin_fd, consout_fd; static int hostbase_fd = -1; -static int need_reinit; - static void *loader_hdl; static char *loader; -static int explicit_loader; +static int explicit_loader_fd = -1; static jmp_buf jb; static char *vmname, *progname; @@ -618,7 +616,7 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) * not try to pivot to a different loader on them. */ free(loader); - if (explicit_loader == 1) { + if (explicit_loader_fd != -1) { perror("requested loader interpreter does not match guest userboot"); cb_exit(NULL, 1); } @@ -627,9 +625,8 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) cb_exit(NULL, 1); } - if (asprintf(&loader, "/boot/userboot_%s.so", interp_req) == -1) + if (asprintf(&loader, "userboot_%s.so", interp_req) == -1) err(EX_OSERR, "malloc"); - need_reinit = 1; longjmp(jb, 1); } @@ -744,13 +741,38 @@ hostbase_open(const char *base) err(EX_OSERR, "open"); } +static void +loader_open(int bootfd) +{ + int fd; + + if (loader == NULL) { + loader = strdup("userboot.so"); + if (loader == NULL) + err(EX_OSERR, "malloc"); + } + + assert(bootfd >= 0 || explicit_loader_fd >= 0); + if (explicit_loader_fd >= 0) + fd = explicit_loader_fd; + else + fd = openat(bootfd, loader, O_RDONLY | O_RESOLVE_BENEATH); + if (fd == -1) + err(EX_OSERR, "openat"); + + loader_hdl = fdlopen(fd, RTLD_LOCAL); + if (!loader_hdl) + errx(EX_OSERR, "dlopen: %s", dlerror()); +} + int main(int argc, char** argv) { void (*func)(struct loader_callbacks *, void *, int, int); uint64_t mem_size; - int opt, error, memflags; + int bootfd, opt, error, memflags, need_reinit; + bootfd = -1; progname = basename(argv[0]); memflags = 0; @@ -787,7 +809,9 @@ main(int argc, char** argv) loader = strdup(optarg); if (loader == NULL) err(EX_OSERR, "malloc"); - explicit_loader = 1; + explicit_loader_fd = open(loader, O_RDONLY); + if (explicit_loader_fd == -1) + err(EX_OSERR, "%s", loader); break; case 'm': @@ -830,6 +854,18 @@ main(int argc, char** argv) exit(1); } + /* + * If we weren't given an explicit loader to use, we need to support the + * guest requesting a different one. + */ + if (explicit_loader_fd == -1) { + bootfd = open("/boot", O_DIRECTORY | O_PATH); + if (bootfd == -1) { + perror("open"); + exit(1); + } + } + vcpu = vm_vcpu_open(ctx, BSP); /* @@ -837,7 +873,12 @@ main(int argc, char** argv) * cb_swap_interpreter will swap out loader as appropriate and set * need_reinit so that we end up in a clean state once again. */ - setjmp(jb); + if (setjmp(jb) != 0) { + dlclose(loader_hdl); + loader_hdl = NULL; + + need_reinit = 1; + } if (need_reinit) { error = vm_reinit(ctx); @@ -854,19 +895,7 @@ main(int argc, char** argv) exit(1); } - if (loader == NULL) { - loader = strdup("/boot/userboot.so"); - if (loader == NULL) - err(EX_OSERR, "malloc"); - } - if (loader_hdl != NULL) - dlclose(loader_hdl); - loader_hdl = dlopen(loader, RTLD_LOCAL); - if (!loader_hdl) { - printf("%s\n", dlerror()); - free(loader); - return (1); - } + loader_open(bootfd); func = dlsym(loader_hdl, "loader_main"); if (!func) { printf("%s\n", dlerror()); From nobody Mon Jan 22 17:30:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfx4kyzz57r86; Mon, 22 Jan 2024 17:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJcfx3q43z4f6c; Mon, 22 Jan 2024 17:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nEUQo96bZSG1oMTUedpjSciOL+3N/3ulHw/5FpZmP8w=; b=lVIkcdvORdudLPN9f2sfXqrJvJvaqnXI7cpEh017FQeq1vpR4vpWufnIrCRGzpi2eireIz v/mBTV9ZSRB/CWT+S/EZhgl5lZGfSPvtUkXuxoGrcXHNkx0vyMTcyie3MpOw+vds71zinh hU+Qu46f6AbFy4TAJXxsqR0B8q8leUVIpR5loQEKQNT4uJpZcGqU8HkEZXpsEfGZh2Bs18 7jBffAFFt8t4EgkYfnkcaWNr5ig57hXolt3QoNRKDpdvtcGQLqbnonXrJ5urKYSLWmHyFM btIWEqnx2LPYI3kYBL6kAGz6hYEVS4Y+H7REGNMHg+n2gcz5/66Kjf23cPiCgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nEUQo96bZSG1oMTUedpjSciOL+3N/3ulHw/5FpZmP8w=; b=XAvgxLNttaUR6HPxDa+QTWrRRIyYI9TBOD8Sbu/68lwM30luWNZfixj4hwBB7y3cw6ARTi HcTIddpghZMeVrBhWG2Y5riYRYlTDa8zGUrbsKfD7zRYIXXZL90dIYSgT3BMKevDwsZmbw qP+2cbX6ynYtm0vbCbRF6twpr1QZn8/A1latp8sSbzeV2rEZmxy/s2qDOK0Bra/xOPr+GQ iWsGvyy7ZLGwM3sPlxUq6F8p3CfOGHOy0/DQgz/fsI/tLSy2wThDzruX1imwtrI4l8NlQ+ IJB1C/qQtVc5XMqVJStOnh+xHUuLsMIwKudxr9B8JFM0KH1IX+CdI0F1XJQQuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944601; a=rsa-sha256; cv=none; b=ABTPdRoonaxGDw4745WNyN7iRtQJXgqaxxySG5o7IGb/PZuAmkUFaKx71yAR+6vksE+ONs Fvytbh4Hkodb8hWMs62LNvmJy216UknRJgnHqQmdaPhcNIkC8UGj5omK0nNFhOp1LLpTsO sG/Obp3W8RFyYs/sP75gtOq7hYIC5aghUG8KqS5/NbgiQ0nkBqcS1WO+C0io6WvK68pJ8U vpfp250Icy7+z8oHp7CFgV0AAimeoi9K1LoEROb1h2EL9/xvLv6OMb/q66D0w15NusbvJ4 TZWXao9jwV0X8waWoB7hZ5UxkZXUZuWiPAx2WokfKHeikCNHuhmRKaNR33oevw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfx2whLz19rc; Mon, 22 Jan 2024 17:30: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 40MHU1Ct007937; Mon, 22 Jan 2024 17:30:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU1KC007932; Mon, 22 Jan 2024 17:30:01 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:01 GMT Message-Id: <202401221730.40MHU1KC007932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 097d8306bfba - stable/14 - bhyveload: enter capability mode after we setup the vcpu List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 097d8306bfba66ef1ceb4e74ab7e0fbf30489c52 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=097d8306bfba66ef1ceb4e74ab7e0fbf30489c52 commit 097d8306bfba66ef1ceb4e74ab7e0fbf30489c52 Author: Kyle Evans AuthorDate: 2024-01-03 22:18:00 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:18:48 +0000 bhyveload: enter capability mode after we setup the vcpu Reviewed by: allanjude (earlier version), emaste, markj (cherry picked from commit 8bf0882e186effbd3d742ce17613cf9dfb81ce0c) --- usr.sbin/bhyveload/bhyveload.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 7503598ba94b..d4f930e8cc76 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -78,6 +78,7 @@ #include #include +#include #include #include "userboot.h" @@ -868,6 +869,12 @@ main(int argc, char** argv) vcpu = vm_vcpu_open(ctx, BSP); + caph_cache_catpages(); + if (caph_enter() < 0) { + perror("caph_enter"); + exit(1); + } + /* * setjmp in the case the guest wants to swap out interpreter, * cb_swap_interpreter will swap out loader as appropriate and set From nobody Mon Jan 22 17:30:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfz04rlz57r3T; Mon, 22 Jan 2024 17:30: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 4TJcfy4V9Kz4fRB; Mon, 22 Jan 2024 17:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srUAzh/SHgKzRakG2hGAi8oiDPGi9S9okXiS+HdzYm4=; b=AoKLuU0YLiJ6LYf1FRQsyZ1WEhe0IwIt7z4w6dqJLH6IakxuiwVYFMl009pc0Sz0PE9JiT rpJTVUv8qx5xAx26rl+Gk0ui1xlxddYc5qtQrniMOEJBazbozmEkNAuaCbqPNX4884BalG YHDEdIG8eU2lCTTHnuIfwNMb8Wx6eDwVxRBHkU1Z354yS5YVtnt/n/fKRbrdoUzrKduICH 7+XKYTLWEWEX/uS6mM3j45YJr/TZeGtn5IMml7F/8SMRmq4TjEXhltv3+1MdX0Z8J8L9pL r1Q0y9F78pqKcd3IKm0Sy8wQ03VUfZQg4ni/qmaSUgAqO9SDkV/sYjuNJTu4sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srUAzh/SHgKzRakG2hGAi8oiDPGi9S9okXiS+HdzYm4=; b=YlanAAVlO3qnCzalGmrcts7kLs+3yPGWcn8GWwdYRZZK/nHwa2YRHNI2mlB0f+TD8Rabt/ x1GxwkpiB/ybgzWyFXsfDmh9Fqld8B8Uuh6uOzDDVLHG3zcBS3UJqLyO1TnaZlq6VlJjrM uM3DLHu3U7OjQ5W6CZycPAgt5M4n0GfoixxE2EmNtnWUP9Ddysr/pL3gUcTyPMFtIFPuEf UdEKP+en0BZvC6u55jmiQ0S7myHwGNgtNlKOk1kfPcULhtelVSysD3riipTDGF9JROVoEM uhJtLATZgh0I3U4DDiyty/vFwtoPPWJpmfDAMYFeZL6pbphZ2m+dmSjGBVdTwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944602; a=rsa-sha256; cv=none; b=JHyp5GZCiDw9hGhGCYJa/0+4vuNZwEt3MbR8FT5JZdg4tUqw+UxbOI/TofvspLEkJDZ7MF mAis0AnhHgNLxt07kf76jNQaI4nCKhslOmYYGhv2BZQsgo8p6rqxTKlxQGEIN1Vrt50CzK DJJk6/LZKqI8z7vJr5B6Opmlz20ebgHFLjMtR2SvFyhltQ01quWU/sChikJhyz8Nk/7cg5 lghffe+p0I7ZJP4XJAGT5wGhQYPD89u3ZrYCxhyZoKi0NUdy9cug+0a+cW1l/za+6OO1Ck djVqWnFGlSHhWR5wZLQBB1toGIeIcq1Xrj7Mn9C/WKHoEIwOl+PUtLyho7FR9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfy3W6Lz19kQ; Mon, 22 Jan 2024 17:30: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 40MHU2gU008238; Mon, 22 Jan 2024 17:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU271008234; Mon, 22 Jan 2024 17:30:02 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:02 GMT Message-Id: <202401221730.40MHU271008234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4bd568bd759b - stable/14 - bhyveload: limit rights on the dirfds we create List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4bd568bd759bfd632425ee13e5e4e83b6a935525 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4bd568bd759bfd632425ee13e5e4e83b6a935525 commit 4bd568bd759bfd632425ee13e5e4e83b6a935525 Author: Kyle Evans AuthorDate: 2024-01-05 06:21:14 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:18:52 +0000 bhyveload: limit rights on the dirfds we create In neither case do we need write access to the directories we're working with; userboot doesn't support fo_write on the host device, and the bootfd is only ever needed for loader loading. This improves on 8bf0882e18 ("bhyveload: enter capability mode [...]") so that arbitrary code in the loader can't open writable fds to either of the directories we need to maintain access to. Reviewed by: imp (cherry picked from commit c067be72e835e469518ec985b6cc4e475c378944) (cherry picked from commit f9b17005bf8f1a30e2a74a3e66c92e34aa87f9bf) --- usr.sbin/bhyveload/bhyveload.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index d4f930e8cc76..16131dacecaa 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -734,12 +734,17 @@ usage(void) static void hostbase_open(const char *base) { + cap_rights_t rights; if (hostbase_fd != -1) close(hostbase_fd); hostbase_fd = open(base, O_DIRECTORY | O_PATH); if (hostbase_fd == -1) err(EX_OSERR, "open"); + + if (caph_rights_limit(hostbase_fd, cap_rights_init(&rights, CAP_FSTATAT, + CAP_LOOKUP, CAP_READ)) < 0) + err(EX_OSERR, "caph_rights_limit"); } static void @@ -860,11 +865,24 @@ main(int argc, char** argv) * guest requesting a different one. */ if (explicit_loader_fd == -1) { + cap_rights_t rights; + bootfd = open("/boot", O_DIRECTORY | O_PATH); if (bootfd == -1) { perror("open"); exit(1); } + + /* + * bootfd will be used to do a lookup of our loader and do an + * fdlopen(3) on the loader; thus, we need mmap(2) in addition + * to the more usual lookup rights. + */ + if (caph_rights_limit(bootfd, cap_rights_init(&rights, + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) { + perror("caph_rights_limit"); + exit(1); + } } vcpu = vm_vcpu_open(ctx, BSP); From nobody Mon Jan 22 17:30:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfz3NhTz57qsb; Mon, 22 Jan 2024 17:30: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 4TJcfz1MBGz4fWg; Mon, 22 Jan 2024 17:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UPXUkfNcTja/ct9jUKp+nCXPc2Pweb7d4wWQ8J1Lyp4=; b=Lc6SsO2d39C9a20K/BGn5ZmkGKQXbpFntG++Vkt+9/0FtT8koEPUhNPdg++Rfj4zmJjOx2 PlD2vCDfVnNDz1C7Sdf6PWyeHQuu2L4T/a1jH+NBHhIYYrAw6ieg9MlS3j0QosE5wPUQhr ATcOOV78fDF6pG/YWVsSNmmQY0BA2LF1LFZZh+ZHPJNhliQaV2doS3ZDmS0qx6p2cMT7UX YExS2J9L2QFJ0CVkZH+VcFqWnM2shPyPmUsuAD0u/CXqBydC+d9IuJSrK9HZVkL6trJV8X fuyPQcDJ0aXMY7Kq05ZlVIVWKWJslOeJYzUXRjXx9ZmTAUt6aO+tSYo81/2/bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UPXUkfNcTja/ct9jUKp+nCXPc2Pweb7d4wWQ8J1Lyp4=; b=HljoEP0xO0BkhZiRqArjVjP/fh/0oNk96+ZcraIOLdRQ1rnrxK6C7DmznNZovniVSFK0/x l5oLVKpdv4NISxLCtjUKaPEL61hHRyc1OnTr6lIB/NrtvbARN5P6a0wLJgR3+wBd5yGXnb U1ZS89InpzfdAmKJcfMNbfHNpoCcq0MK7+ymw/Ubz/XuqWbSU44w6Z87NSNIFkxiKeoGWM Sv0Vl9Eqt54ZkvpIfufvQ5GeUB/iiPY4GrHVCqf/8Jrpn6gR7pbtp/8k3yC1QHSz7tBu8s 74RyoXCIVhzOvph8VszJwN7pedxuNxcVS1YWdleJJfnVrOxDJd0tKtqnAKTKhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944603; a=rsa-sha256; cv=none; b=KvAEOfu7kqMeJWg1V3uyqMsXk45Fijchh1CFp+PmZZJgTvVpNQySy+pr4rUy+qKDrpf1OP Uc2ZuW+lPkWquxvYRkdsartI+lgqSWCZwkPSjoCgcU+fsZpHpUeRPy7SbjcupsU//bksNW ze6rdQsW1V8FGRxu5KTEkc5GSE/fwz8r98detXfkOhOOBSF+TaaBR6erDlzFtAcUtvqLUH Zh3iK3UmELc2C0z2VECvx1zU3notxENEXLyMIIz+S/J+dJkFLdlX9Ja3XwsmyfhwB9/ZM7 XSqrPAnfWTgRc6Hx93N7Pzxm/VfgK1AmSi4mNBs4zbuUPRt/CHRkAzwjFLEPdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfz0Sq3z19pC; Mon, 22 Jan 2024 17:30: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 40MHU2ou008492; Mon, 22 Jan 2024 17:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU2g6008488; Mon, 22 Jan 2024 17:30:02 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:02 GMT Message-Id: <202401221730.40MHU2g6008488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b7390f6f8412 - stable/13 - bhyveload: hold /boot and do relative lookups for the loader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b7390f6f8412fe46413b7fba6d3e74709d8e21e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b7390f6f8412fe46413b7fba6d3e74709d8e21e2 commit b7390f6f8412fe46413b7fba6d3e74709d8e21e2 Author: Kyle Evans AuthorDate: 2024-01-03 22:17:59 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:48 +0000 bhyveload: hold /boot and do relative lookups for the loader The next change will push bhyveload into capability mode right after we allocate vcpu state, before we've setup or entered the loader, to limit the surface area that a rogue loader script can touch. With an explicit -l loader, we don't need to preopen /boot because changing interpreters isn't allowed. We'll just dlopen() entirely in advance in that case to eliminate some complexity. Reviewed by: allanjude (earlier version), markj (cherry picked from commit bf7c4fcbbb05ff99afde0744d013feeb35d77191) (cherry picked from commit 67082f077f39d9c7b7bd561c14622e6f3ef23681) --- usr.sbin/bhyveload/bhyveload.c | 73 +++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 797f8b88dad2..c11b1814cfc7 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -94,11 +94,9 @@ static int ndisks; static int consin_fd, consout_fd; static int hostbase_fd = -1; -static int need_reinit; - static void *loader_hdl; static char *loader; -static int explicit_loader; +static int explicit_loader_fd = -1; static jmp_buf jb; static char *vmname, *progname; @@ -615,7 +613,7 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) * not try to pivot to a different loader on them. */ free(loader); - if (explicit_loader == 1) { + if (explicit_loader_fd != -1) { perror("requested loader interpreter does not match guest userboot"); cb_exit(NULL, 1); } @@ -624,9 +622,8 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) cb_exit(NULL, 1); } - if (asprintf(&loader, "/boot/userboot_%s.so", interp_req) == -1) + if (asprintf(&loader, "userboot_%s.so", interp_req) == -1) err(EX_OSERR, "malloc"); - need_reinit = 1; longjmp(jb, 1); } @@ -741,13 +738,38 @@ hostbase_open(const char *base) err(EX_OSERR, "open"); } +static void +loader_open(int bootfd) +{ + int fd; + + if (loader == NULL) { + loader = strdup("userboot.so"); + if (loader == NULL) + err(EX_OSERR, "malloc"); + } + + assert(bootfd >= 0 || explicit_loader_fd >= 0); + if (explicit_loader_fd >= 0) + fd = explicit_loader_fd; + else + fd = openat(bootfd, loader, O_RDONLY | O_RESOLVE_BENEATH); + if (fd == -1) + err(EX_OSERR, "openat"); + + loader_hdl = fdlopen(fd, RTLD_LOCAL); + if (!loader_hdl) + errx(EX_OSERR, "dlopen: %s", dlerror()); +} + int main(int argc, char** argv) { void (*func)(struct loader_callbacks *, void *, int, int); uint64_t mem_size; - int opt, error, memflags; + int bootfd, opt, error, memflags, need_reinit; + bootfd = -1; progname = basename(argv[0]); memflags = 0; @@ -784,7 +806,9 @@ main(int argc, char** argv) loader = strdup(optarg); if (loader == NULL) err(EX_OSERR, "malloc"); - explicit_loader = 1; + explicit_loader_fd = open(loader, O_RDONLY); + if (explicit_loader_fd == -1) + err(EX_OSERR, "%s", loader); break; case 'm': @@ -827,12 +851,29 @@ main(int argc, char** argv) exit(1); } + /* + * If we weren't given an explicit loader to use, we need to support the + * guest requesting a different one. + */ + if (explicit_loader_fd == -1) { + bootfd = open("/boot", O_DIRECTORY | O_PATH); + if (bootfd == -1) { + perror("open"); + exit(1); + } + } + /* * setjmp in the case the guest wants to swap out interpreter, * cb_swap_interpreter will swap out loader as appropriate and set * need_reinit so that we end up in a clean state once again. */ - setjmp(jb); + if (setjmp(jb) != 0) { + dlclose(loader_hdl); + loader_hdl = NULL; + + need_reinit = 1; + } if (need_reinit) { error = vm_reinit(ctx); @@ -849,19 +890,7 @@ main(int argc, char** argv) exit(1); } - if (loader == NULL) { - loader = strdup("/boot/userboot.so"); - if (loader == NULL) - err(EX_OSERR, "malloc"); - } - if (loader_hdl != NULL) - dlclose(loader_hdl); - loader_hdl = dlopen(loader, RTLD_LOCAL); - if (!loader_hdl) { - printf("%s\n", dlerror()); - free(loader); - return (1); - } + loader_open(bootfd); func = dlsym(loader_hdl, "loader_main"); if (!func) { printf("%s\n", dlerror()); From nobody Mon Jan 22 17:30:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcfz5pMRz57r6T; Mon, 22 Jan 2024 17:30: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 4TJcfz4ykGz4f6t; Mon, 22 Jan 2024 17:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6d/BZFWchlz1MyCAENYTn281nVx3WR7GhLN0oTaZWgQ=; b=TRqTvgbyY6eCkBC7iEzfqzk5K1YVGQmX5ppDSCriZwB9wDE5N/PVDmr7n5AnUxMh518I4i 7+EOCAQMlPamtFUlojU8L/VzvXCvAH+aleoxynfymPFq2a1FjwsRor6o23qtySeGslb2QP Q4L4rNljSExoNxMnmhHF1FYwp60NX2C0lOCh+slX2njzbRBDkZ4QEOQiDANJw610QKxWYT 8nyZ5nkh/2/uBsNSNcZ8tNVutXEIlz17DooyfzAfWYaqksX6crA8GLvQWsycpDpdiqUnQP tdq3Xr07OxsXF1XSBdCb3GTwaIKN97yE2ZqUCUICMbwZ7feWMCl/t4yPNd0Xhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6d/BZFWchlz1MyCAENYTn281nVx3WR7GhLN0oTaZWgQ=; b=w6mbxo4AWQkSi6PyDfDRC307gTt6DhHC6eKOxcfCVbaTgItRv+bWjyL7ElP2upWbmok870 5KMWtmFF7iHOJwpO0Dy2DQm92tt9jnxS4GyAFcNMpjY2y15/6+iB0ll+Z8FRzkKvQcKBY2 JUomjkctaeRTqz/8OyGQ8WpE2mAP4MgMJKSQybMyDHGufIfdb/jOTNGf41vQlla3TSRowC yy52VJnoXBZ45ROuyJ2C4lQtD4lBpErZn4YJoVwuHXhWH+HisbszqYmQvIwEVYqMD4LaMT +/6kRIrYy6w0ssvQRkPqW+HVKB8SI0xV7CoyIy7mPNl5oztarae8wMoUNYBcjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944603; a=rsa-sha256; cv=none; b=yg6cyQkFXf1t9SwHms7Q3oBjeXG6jrJYqvY0exbtCzoErUjopI+Yb7Dh8vBeBL0WpzRHU8 vjnXE/pUDUdhaNROt9RX56yqLa5EccUmfTohYoxXMiIsx6JK1oo4DgSWlRTw3LgScj9vjT d5R1zQVUYhKe4sOKXXjlKR15Ql1TznDBcL/2At4rs/A4tWlvNhxVos8ihSM2SUVFGAIz2w 0jS9alrbwmUdCBKGYC5kSz0C2SOGZhattzPS/9/I8P6LqhkV5LzPnbhjngfvYx6BrBV01I aA2tmXSI32lqcAy8orgrS4Wj8rLtYMWH5XhtgPPCkMXB1KIQOdnaieqjnkp+Mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcfz44qtz19Zg; Mon, 22 Jan 2024 17:30: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 40MHU3VZ008648; Mon, 22 Jan 2024 17:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU3m0008644; Mon, 22 Jan 2024 17:30:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:03 GMT Message-Id: <202401221730.40MHU3m0008644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3b01995df47a - stable/14 - bhyveload: support guest rebooting from the loader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b01995df47a0184ecbb6777b88a3a0bd3c6797c Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3b01995df47a0184ecbb6777b88a3a0bd3c6797c commit 3b01995df47a0184ecbb6777b88a3a0bd3c6797c Author: Kyle Evans AuthorDate: 2024-01-05 06:21:15 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:18:58 +0000 bhyveload: support guest rebooting from the loader userboot has a EXIT_REBOOT code that it uses when the 'reboot' loader command is executed. Use that and longjmp back to reinit the VM entirely with a reboot request. This fixes the 'reboot' option in the loader menu to actually reboot rather than shutdown the VM. The JMP_* constants are introduced to keep track of why we're doing a longjmp, though they aren't currently used. We'll notably still do a complete reload of the interpreter to give the rebooted VM that new loader smell. It just seemed forward thinking to just keep track of the different setjmp points. While we're here, we don't actually need to keep the fd we passed to fdlopen(3), so let's avoid leaking it. Reviewed by: markj (cherry picked from commit 24cd5c26fe3ef7181e85467d9d55afbd76af5a2c) --- usr.sbin/bhyveload/bhyveload.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 16131dacecaa..4f16f58bfc9f 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -89,6 +89,16 @@ #define NDISKS 32 +/* + * Reason for our loader reload and reentry, though these aren't really used + * at the moment. + */ +enum { + /* 0 cannot be allocated; setjmp(3) return. */ + JMP_SWAPLOADER = 0x01, + JMP_REBOOT, +}; + static struct termios term, oldterm; static int disk_fd[NDISKS]; static int ndisks; @@ -543,6 +553,8 @@ cb_exit(void *arg __unused, int v) { tcsetattr(consout_fd, TCSAFLUSH, &oldterm); + if (v == USERBOOT_EXIT_REBOOT) + longjmp(jb, JMP_REBOOT); exit(v); } @@ -628,7 +640,7 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) if (asprintf(&loader, "userboot_%s.so", interp_req) == -1) err(EX_OSERR, "malloc"); - longjmp(jb, 1); + longjmp(jb, JMP_SWAPLOADER); } static struct loader_callbacks cb = { @@ -769,6 +781,8 @@ loader_open(int bootfd) loader_hdl = fdlopen(fd, RTLD_LOCAL); if (!loader_hdl) errx(EX_OSERR, "dlopen: %s", dlerror()); + if (fd != explicit_loader_fd) + close(fd); } int From nobody Mon Jan 22 17:30:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg11KByz57rDL; Mon, 22 Jan 2024 17:30: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 4TJcg06Sfyz4fRd; Mon, 22 Jan 2024 17:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=el+TpVZQK9toXcdwvD0Ueel3dNptOHJRHefBcXudwFk=; b=IE0vha4iJpr4HvXH3iBo9fNNGlAe2Bixm/cP/sznPgA57o1XUsaF5nlkK8f6oDMxBuzpzE 7py5j2jRpJs9qAYkkhAR5cxkFjkHiFKSZdzatrRDUpYKeFUhIIGp2hf8f1dkYnUj/pZLeg nAAflQPMrM2ehOoZjOV7x04mA/n1+mtHmuePf7XyaNen7g3iOwZVMCHxjjWQ31IIzHk+KD bCTvckemiLvGIBLQFcD0gVj3DnnFPekY3s03Kms6i384JRqCq7AH6WUBbaPKC3u7cl43rv Wo9cHU9LZfDerMGVS9wjoEdEnh6JdRRHAVeHJwJxFEZHIJrSPYhaqBjg80++pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=el+TpVZQK9toXcdwvD0Ueel3dNptOHJRHefBcXudwFk=; b=cHoQHZ4jdbKyUc4JdtYrFoHOOrRYAreORNF5V5hBABc9LNRo5RnT+sczWVJklAi1YATpDm TktNGthnnEBaKl6+TBFP3KKGDchatkuDk7GQ15gTUB1ozZtwgQnDVASVyzU1EasBA9yUOC 8rBr12VLcsECA9SCeru9vceCX1M2gSOyVy1706F7UgwqOXuy7SvFuWFu7ebDFG3TaYlxUj 6Ew1/Il88XoyXgKtre/jpZslBGjnNfe53+QHulvbra6+KyfhlGOUIHQYGYzgfo5eSjUYco /Spyr8xpgosiddrmBtxF2ERxxRSrADbzcuhPI7HE/D+vd8tXfGdn56/9cHd2UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944604; a=rsa-sha256; cv=none; b=DZSrge41osQkk5qiSCgz9XoWPs0i2SSEn1oywvAX9ME+qDnLWWly09/7b0C+QsEuyVl5en KwlceZrFYXZpyyoJfjqx/6vML7r4Iq7UmiDyyXtQ80kNjsa0+j2nCD8WLR36z3Z4TXiv2Y ewlqBcHMJUAhmTvcquIgKwReGQ7lC4uSP8Bhf5StdlrvaSjdzH1dX2ZrEuBYU11ux2BM+o q3+ZUG6o4NTA0ISfMKaobiKDHTcHisdD1rui0GJxpUI8/sU2tUMTIHXpSxeF+GfmoPc3rm 7Os6pcTq6xQvZCzgx7ygNAXaKo8bHGO1BeZYETbzWzf7QY2N8tM4mmRRA8+c4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg04wvCz19PS; Mon, 22 Jan 2024 17:30: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 40MHU4K0008985; Mon, 22 Jan 2024 17:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU4xg008980; Mon, 22 Jan 2024 17:30:04 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:04 GMT Message-Id: <202401221730.40MHU4xg008980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7b74346b7d34 - stable/14 - bhyveload: make error printing consistent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b74346b7d3463a7f5c8d8464830e18b48ca3c2c Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7b74346b7d3463a7f5c8d8464830e18b48ca3c2c commit 7b74346b7d3463a7f5c8d8464830e18b48ca3c2c Author: Kyle Evans AuthorDate: 2024-01-08 17:49:40 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:19:09 +0000 bhyveload: make error printing consistent Previously we used a mix of perror(3) + exit(3) and err(3); standardize on the latter instead. This does remove one free() in an error path, because we're decidedly leaking a lot more than just the loader name there (loader handle, vcpu, vmctx...) anyways. Reviewed by: markj (cherry picked from commit a4a838a31ac24e19c8ee68d45cf5234615d0b958) --- usr.sbin/bhyveload/bhyveload.c | 49 ++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 4f16f58bfc9f..4d89393424f4 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -861,18 +861,14 @@ main(int argc, char** argv) need_reinit = 0; error = vm_create(vmname); if (error) { - if (errno != EEXIST) { - perror("vm_create"); - exit(1); - } + if (errno != EEXIST) + err(1, "vm_create"); need_reinit = 1; } ctx = vm_open(vmname); - if (ctx == NULL) { - perror("vm_open"); - exit(1); - } + if (ctx == NULL) + err(1, "vm_open"); /* * If we weren't given an explicit loader to use, we need to support the @@ -882,10 +878,8 @@ main(int argc, char** argv) cap_rights_t rights; bootfd = open("/boot", O_DIRECTORY | O_PATH); - if (bootfd == -1) { - perror("open"); - exit(1); - } + if (bootfd == -1) + err(1, "open"); /* * bootfd will be used to do a lookup of our loader and do an @@ -893,19 +887,15 @@ main(int argc, char** argv) * to the more usual lookup rights. */ if (caph_rights_limit(bootfd, cap_rights_init(&rights, - CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) { - perror("caph_rights_limit"); - exit(1); - } + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) + err(1, "caph_rights_limit"); } vcpu = vm_vcpu_open(ctx, BSP); caph_cache_catpages(); - if (caph_enter() < 0) { - perror("caph_enter"); - exit(1); - } + if (caph_enter() < 0) + err(1, "caph_enter"); /* * setjmp in the case the guest wants to swap out interpreter, @@ -921,26 +911,19 @@ main(int argc, char** argv) if (need_reinit) { error = vm_reinit(ctx); - if (error) { - perror("vm_reinit"); - exit(1); - } + if (error) + err(1, "vm_reinit"); } vm_set_memflags(ctx, memflags); error = vm_setup_memory(ctx, mem_size, VM_MMAP_ALL); - if (error) { - perror("vm_setup_memory"); - exit(1); - } + if (error) + err(1, "vm_setup_memory"); loader_open(bootfd); func = dlsym(loader_hdl, "loader_main"); - if (!func) { - printf("%s\n", dlerror()); - free(loader); - return (1); - } + if (!func) + errx(1, "dlsym: %s", dlerror()); tcgetattr(consout_fd, &term); oldterm = term; From nobody Mon Jan 22 17:30:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg05Z6mz57r3Y; Mon, 22 Jan 2024 17:30: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 4TJcg01yLTz4fcT; Mon, 22 Jan 2024 17:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMJvzmY3p5mhc4f3QiKTSS1aa+s8enZPc943vjwIMTk=; b=wmaHMFPa1ZugNbZzwq//amyU2O6LiAFX9VQoSOXZB508FOD7wog4ojODAXEkLQYHX8/4tT Ws8yFFRjveLIE5WJnAyhQMxYUQOS6zWwThC3qFxa+4blN3B6TBwm5jRU0cHFD+ElBARHPu gQ0ifRlHXeCcIePMYcD6/YsIWs3O7j72nD608BDDBgObCN1kIgJOH+++LEQoVyh4YythRP XOF1KGnd7gA8fcKyrHaRnP5RtKJrdLb9dIn3VXQYFLwqQAPTtOmfxymeJq6aqJ+zaeE+Ig y1g3a5Y54C76om9xDdIZQ42Gad+EbjVF3i3ulkTGluCujNFb9y+0m0jZ2drIAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMJvzmY3p5mhc4f3QiKTSS1aa+s8enZPc943vjwIMTk=; b=awYyXl4P9GFXwQeV2tx4hRQXIY/FSbV8jk6Mj4FPMVZZ4FLT9tdKeX0CNci++it6x4uPmY iI82jHdI/hM3IAyLcO4Ah+zjjcCymJEX/lK4VLQvH24h3rwwsIGH25UiEbUAyKwIyMvU8t uXi3Q7fyGD33UPG4kg4k9iSqkT5YWvDVRgjzAvFbSOqLDxBUiH5Xe586c7eTArO/pnjPLc w5BQbTP1lngpLGOyom9K9l1GBSFYwk+zF22/lkKQbSAahlzXpGTUNzhGiBEHqfc94dbXgD VN0UGuMPsD9ENT3qnAW8nPbjttPSjCQYYogmqz7mpy+XcXsGYhZHBeJ2QFFhxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944604; a=rsa-sha256; cv=none; b=CYxAu17dcUiFgWMou+5cj57HFHJEdi5SwmdyWKxcpBsJX0dhfKnwtKHRQR9ZaQwt6O/o1h SDbjNWQVeql1X1Vd4++rIUhawReOwgYdTQ4CKf12zXREvLxhuRKDygcmrXR1hLAMGFNO2S XcNlj41FXjz9amk1glRavH4aFgYHCyMADMkuI8j3BUYAVS4gB0N5wGGO1A7oN8W0S6Shyi ajSpYUMn6YZF5eoHuH64ptDN6J52WU1hfZ76V7ot+SzMIWGbpZExQEXeIy9twDH+pHWybi atwV7Ylo48sJvv/pmrljlU98rqj2rH/Wv4nPzGel2H6DYN7ItbhHubTBlDLr7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg014R6z19Zh; Mon, 22 Jan 2024 17:30: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 40MHU4fJ008826; Mon, 22 Jan 2024 17:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU4po008823; Mon, 22 Jan 2024 17:30:04 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:04 GMT Message-Id: <202401221730.40MHU4po008823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: c6989de2e700 - stable/13 - bhyveload: enter capability mode after we setup the vcpu List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c6989de2e7007ab4ddca92bf4f3f8eca9c50c6b7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c6989de2e7007ab4ddca92bf4f3f8eca9c50c6b7 commit c6989de2e7007ab4ddca92bf4f3f8eca9c50c6b7 Author: Kyle Evans AuthorDate: 2024-01-03 22:18:00 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:52 +0000 bhyveload: enter capability mode after we setup the vcpu Reviewed by: allanjude (earlier version), emaste, markj (cherry picked from commit 8bf0882e186effbd3d742ce17613cf9dfb81ce0c) --- usr.sbin/bhyveload/bhyveload.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index c11b1814cfc7..86f046a0a0c9 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -78,6 +78,7 @@ #include #include +#include #include #include "userboot.h" @@ -863,6 +864,12 @@ main(int argc, char** argv) } } + caph_cache_catpages(); + if (caph_enter() < 0) { + perror("caph_enter"); + exit(1); + } + /* * setjmp in the case the guest wants to swap out interpreter, * cb_swap_interpreter will swap out loader as appropriate and set From nobody Mon Jan 22 17:30:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg13dDgz57qsf; Mon, 22 Jan 2024 17:30: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 4TJcg12Jkzz4fRq; Mon, 22 Jan 2024 17:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwTsK5POItYwynC+9ru1deM+Eb9lcbhi+gZD7IDk+Nc=; b=gEYOqBELTfHXbCMKYF0cBTCPvBlBpskIuNiRBpIiHICM3F+KYPUVxbP8rT2WZCmZT77Qxi iRxPGSmP5IMSPECqFJkfCl5K5oljw+iQLGCFWyFCMmp+kxNhgd4wLbPeNISB4s9KpTX8Nl BISRmObpv2d0xxUlT4lYGa/lkGxwmtQ4hGZ/NSzKqUVwBD09W2FTva14O5YftC+WzE84Uz iOGWinAWXgoUOLL8P7YZLwU9fnNfU2q22XC2dhBokXBgP/aXp7DaNv1DE/GXtElcdWHuy4 BqBBpsc71/SU5hKdjJQmPhrDUNQShTKLddCyHqEUTVGuzHMjffpgUuuDTq9TLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwTsK5POItYwynC+9ru1deM+Eb9lcbhi+gZD7IDk+Nc=; b=lg5FhKP3t2/my0gxGbZYt+KwabNXIiOQe+Z/6xLsEAdbWPYXy+cl3pKWf0NZNLMFVLIDxu u04Fndw7p0eczXfqK9DBNM8v4UkUoTVYWM/iaBi3rdrOSHfsdeLl6AsRXr79+kc4PkYXl/ ZiLuEfOsaobCA7J4ictK5PyVyKJ+jmhJfW1d7GNALo9QIIEumnU9cHswB3VJIrcyDKBYin C73FAcRpw7xN6LOd/R0ophUyL2w0jLWW9tGDfUhFCOA7BFOGPQB4ljUPXSV9SoJ8yHN76u WGP+DOrvmBm73cVzhKB62NTbY+u0VcFwpltcgZBSkKrq0kSM3Z0U1l4QStm1TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944605; a=rsa-sha256; cv=none; b=R4iajkpZMs22IjPgnsd1Cz9r8zFN8LZKHviN3a65IAZb49D1Y9XhJsrAnRuJPejcY9+ZPI 0T+dnJNGhCUw9qDQFW93qZMNDnXSnPT7Xx3Tz0v/mAKSXiCNuxPtAdzxMNaNACW+oR88hO Sz079TyThEhfFv25P5E/GLvJITfTmkmuEMLKZklz7zOEYIosGvBrbA2BJ3faOi/+W0wn3X GZCWMajzN9CgYfZxzofKNi48IGyQthPkW2u2RzBZ4KY88+hz/db9Nq7r4Y+xmYlrWRyPoY H1CjphuUINrHWS8Oh3aYm2nbLW0XF6PQ9vLs2YA8d6B6rER4L3s4U5IEXYCNhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg11QRgz19Zj; Mon, 22 Jan 2024 17:30: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 40MHU502009156; Mon, 22 Jan 2024 17:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU5wR009150; Mon, 22 Jan 2024 17:30:05 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:05 GMT Message-Id: <202401221730.40MHU5wR009150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 20e06202f126 - stable/13 - bhyveload: limit rights on the dirfds we create List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 20e06202f126b52fd9718e611e4b42ea43908fb5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=20e06202f126b52fd9718e611e4b42ea43908fb5 commit 20e06202f126b52fd9718e611e4b42ea43908fb5 Author: Kyle Evans AuthorDate: 2024-01-05 06:21:14 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:52 +0000 bhyveload: limit rights on the dirfds we create In neither case do we need write access to the directories we're working with; userboot doesn't support fo_write on the host device, and the bootfd is only ever needed for loader loading. This improves on 8bf0882e18 ("bhyveload: enter capability mode [...]") so that arbitrary code in the loader can't open writable fds to either of the directories we need to maintain access to. Reviewed by: imp (cherry picked from commit c067be72e835e469518ec985b6cc4e475c378944) (cherry picked from commit f9b17005bf8f1a30e2a74a3e66c92e34aa87f9bf) --- usr.sbin/bhyveload/bhyveload.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 86f046a0a0c9..d4f282bcc178 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -731,12 +731,17 @@ usage(void) static void hostbase_open(const char *base) { + cap_rights_t rights; if (hostbase_fd != -1) close(hostbase_fd); hostbase_fd = open(base, O_DIRECTORY | O_PATH); if (hostbase_fd == -1) err(EX_OSERR, "open"); + + if (caph_rights_limit(hostbase_fd, cap_rights_init(&rights, CAP_FSTATAT, + CAP_LOOKUP, CAP_READ)) < 0) + err(EX_OSERR, "caph_rights_limit"); } static void @@ -857,11 +862,24 @@ main(int argc, char** argv) * guest requesting a different one. */ if (explicit_loader_fd == -1) { + cap_rights_t rights; + bootfd = open("/boot", O_DIRECTORY | O_PATH); if (bootfd == -1) { perror("open"); exit(1); } + + /* + * bootfd will be used to do a lookup of our loader and do an + * fdlopen(3) on the loader; thus, we need mmap(2) in addition + * to the more usual lookup rights. + */ + if (caph_rights_limit(bootfd, cap_rights_init(&rights, + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) { + perror("caph_rights_limit"); + exit(1); + } } caph_cache_catpages(); From nobody Mon Jan 22 17:30:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg21Lwrz57r6c; Mon, 22 Jan 2024 17:30: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 4TJcg16Ndcz4fZY; Mon, 22 Jan 2024 17:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cciZMWXAiZ3KauEX/4O33zW0bkcqY/ORFZJ85NcDb6M=; b=NT36BCGCL2illYP39PtMh/h/mflY8q9sa90RlNo1KM+VvmX12FGO1+0wRbq0YrDo4MyngB o/ZE2Zv1rgU1CwYUuLt0wdQulb8iMQ7JR4ZFCIA5F21hWsRYzExOgdslRedRs6tuITo1f1 Ke/WOQ8cc5lrCyHCkszHkh4iiysQYNN83VPgo5qFYKisRqKf9DRwZgQieImixzReUhFw3V xzmKkA4/IUdU0DPUk1A1MIps1HYEnLFUEWkuG2w/z/bwvZoOyWGxAI4q+JGaWD9OpFuViz 1EDYd4sK27T+MQCSDA70rxKe1hvB/xfk9cW4hvXI2tW+SIXTr7wdV9RH4qsAkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cciZMWXAiZ3KauEX/4O33zW0bkcqY/ORFZJ85NcDb6M=; b=ejPB00HPPUaoRPorqWggSs2NvMn3Rpr1TXMCqzcIQS13iLfYl2QW0GGItIQuutEWj91u51 8rXzRLpAL9p5YQz03K3Qfm5RAc7Vy23ADzXcJml84UnTtFmY1PbybzcATibsebZsm/oooe mhhX53amQUE+CI3XJom06PbK/NmJacnHoyybZL84yM/5KHmScpSBnZi7lcqRuTGDH5sH9I LTw8jzZer4UNPc/oCSGPQe/O1TUAHPWuWUkz/hH6As14ckkoOa0cmTGZAo/nVU9URzx1t4 8L35VX8Lh/piILfXoifa9S2rDRMkG2/1X1Y2u8VODG4Mm/iKVprKayEltj+yTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944605; a=rsa-sha256; cv=none; b=YhYZjRAZ/it9p4p9cKgupL4RaFdoNCL8K/PKn8MdmphOWmoWBKqi9knD7RWiRgrOpGLkvf euPrNFg/KPb6BKPv4wDOqk+gI8B0a4q4hZxmazL/kyIOi1Y0Ba7swGsr6Ax49xdSiKLI3P /QX5M9GincLJ9G50JzjSabqHSCePvmnsWE/TFY3/rHm5Hbd1xwu6jpRTqGgVHbYJZMgL35 Yx9tNtly93UyXuRscxuGTiIa4wYoHF5J8F/4Oxp6H6HL9NVRyurXobMXjh/0XQzFXMhfad S9RALbNEEq/qCJQ4EDmvE8R1shiT085TWGMUj2lCf8nt9vIcnMoa5zP/C7GI6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg15VLcz19PT; Mon, 22 Jan 2024 17:30: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 40MHU5iY009322; Mon, 22 Jan 2024 17:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU5fv009318; Mon, 22 Jan 2024 17:30:05 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:05 GMT Message-Id: <202401221730.40MHU5fv009318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: a95fbd3da860 - stable/14 - bhyveload: add CAP_SEEK to our dirfd rights List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a95fbd3da860dc9db776c5cb0acd064aff5c1610 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a95fbd3da860dc9db776c5cb0acd064aff5c1610 commit a95fbd3da860dc9db776c5cb0acd064aff5c1610 Author: Kyle Evans AuthorDate: 2024-01-09 03:08:16 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:19:14 +0000 bhyveload: add CAP_SEEK to our dirfd rights In the case of hostbase_fd, this is infact a bug fix; we have a seek callback that the host: filesystem may use in loader, and we really don't have a good excuse to break it. bootfd-derived fds will only be used with fdlopen(3) and rtld doesn't seem to need pread / lseek at all for it today, but there's no reason to break if it finds a good reason to later. Suggested by: markj (cherry picked from commit cef5e56f3fea33d6c421276af49f2967453ad4ff) --- usr.sbin/bhyveload/bhyveload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 4d89393424f4..5250e2120938 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -755,7 +755,7 @@ hostbase_open(const char *base) err(EX_OSERR, "open"); if (caph_rights_limit(hostbase_fd, cap_rights_init(&rights, CAP_FSTATAT, - CAP_LOOKUP, CAP_READ)) < 0) + CAP_LOOKUP, CAP_PREAD)) < 0) err(EX_OSERR, "caph_rights_limit"); } @@ -887,7 +887,7 @@ main(int argc, char** argv) * to the more usual lookup rights. */ if (caph_rights_limit(bootfd, cap_rights_init(&rights, - CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_PREAD)) < 0) err(1, "caph_rights_limit"); } From nobody Mon Jan 22 17:30:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg26KYnz57rDM; Mon, 22 Jan 2024 17:30: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 4TJcg23MWvz4fTt; Mon, 22 Jan 2024 17:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J94xTE78ii2gYU0wljEpsDBOdOU2Z716qxykqgQcpYg=; b=na1oV0E1hUEFpNN1fppTenvnKZ5feuoxG7vtb8eaMH0l83Jo+dG9kqXHl9SOUjv2SqMNEb 2IzZ2b42inS/18Hzrc+66auv7Zs66GCFJcK0V7tVlufVhl2ey61AStM0/p2fe9diZchB2H PiNgcrfmWbuRB1PS1/h1CImm9Dq8bv+LZXrkuhfEHez9J4YTmr1RKrJP/z2k95hPU1vq7M FkrNyzGdZYm3wWK2iwj1nQ5iBn94Q97C1Wl8V7EVGVx6W8arFQgkyjoLLmikBpw4/j8D66 lLGgwLiFA5RZCFpTNIAhnKwvpDS3r5yw7ZDxtN23Kx0roBZn2vMqrZkzlsZRWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J94xTE78ii2gYU0wljEpsDBOdOU2Z716qxykqgQcpYg=; b=X+0qu1Bbn50AxAFX0zL4mbNgxuGIYbXtD86+NdoiUoxO1qpJoXDDcv0j3H1XLUePJyK/qI ZN/U6DmVfAlHoJUxEK0b3G8HBrL2uS5eW3kM58YsUZxDdNLJSqapym8GDq27w5VSkAmmpB A/+tuX6KW+cKeqeB9WpzNV0+SVF/lcBBgZd0K2FIwIy4YmKitA3kGEFrb9AWTtbcM2dZUD HnngN93xCvoI9ttks6j155a1Z4a6XzVch/FZZjQuVbyEGGhnIlbHM6Eh4J4xa3fYdWQ9gS huGZP1DaVVvbrT6cxwutNocNVVCsmeEt3wrN8EUSMVoHGKRkR+4rQ/zG2wgLtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944606; a=rsa-sha256; cv=none; b=Igr4T1ctIFCvzgUG+kW8ve8b5jXJavJw18MMSN5/837+S8tt0v9svPE1fwD80muDUD7SYa GPTU7Oo1D0HQtGt4ATSDR/hu9StiU3xL6T4FyC+3htrnrE6LTw01tuMtO6dkb81vQYSm5z GflRh78FdiOzwDv5M6LVMD2HD97/YNFwTjE7c9vHrdTXN+q65fdd4VtVaJHXPSsZ+KE0dg fJMyL7YVcNKZ6Rs27PhgtNcbskNRbFe5JTffow5e7n+I4ryfu037FEINcG76pGBYQmH2xL wjNbde8t3RptIIk6ZjGn3f5qDEUs27CgKkL2Zc7bZJN6ZKccROVWvqhqlU4MWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg222cPz19lt; Mon, 22 Jan 2024 17:30: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 40MHU6JX009488; Mon, 22 Jan 2024 17:30:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU6Ua009483; Mon, 22 Jan 2024 17:30:06 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:06 GMT Message-Id: <202401221730.40MHU6Ua009483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 482ab31c64cd - stable/13 - bhyveload: support guest rebooting from the loader List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 482ab31c64cd6da8f1044eaef87212581dc4884d Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=482ab31c64cd6da8f1044eaef87212581dc4884d commit 482ab31c64cd6da8f1044eaef87212581dc4884d Author: Kyle Evans AuthorDate: 2024-01-05 06:21:15 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:52 +0000 bhyveload: support guest rebooting from the loader userboot has a EXIT_REBOOT code that it uses when the 'reboot' loader command is executed. Use that and longjmp back to reinit the VM entirely with a reboot request. This fixes the 'reboot' option in the loader menu to actually reboot rather than shutdown the VM. The JMP_* constants are introduced to keep track of why we're doing a longjmp, though they aren't currently used. We'll notably still do a complete reload of the interpreter to give the rebooted VM that new loader smell. It just seemed forward thinking to just keep track of the different setjmp points. While we're here, we don't actually need to keep the fd we passed to fdlopen(3), so let's avoid leaking it. Reviewed by: markj (cherry picked from commit 24cd5c26fe3ef7181e85467d9d55afbd76af5a2c) --- usr.sbin/bhyveload/bhyveload.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index d4f282bcc178..f2a91f95ce89 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -89,6 +89,16 @@ #define NDISKS 32 +/* + * Reason for our loader reload and reentry, though these aren't really used + * at the moment. + */ +enum { + /* 0 cannot be allocated; setjmp(3) return. */ + JMP_SWAPLOADER = 0x01, + JMP_REBOOT, +}; + static struct termios term, oldterm; static int disk_fd[NDISKS]; static int ndisks; @@ -542,6 +552,8 @@ cb_exit(void *arg __unused, int v) { tcsetattr(consout_fd, TCSAFLUSH, &oldterm); + if (v == USERBOOT_EXIT_REBOOT) + longjmp(jb, JMP_REBOOT); exit(v); } @@ -625,7 +637,7 @@ cb_swap_interpreter(void *arg __unused, const char *interp_req) if (asprintf(&loader, "userboot_%s.so", interp_req) == -1) err(EX_OSERR, "malloc"); - longjmp(jb, 1); + longjmp(jb, JMP_SWAPLOADER); } static struct loader_callbacks cb = { @@ -766,6 +778,8 @@ loader_open(int bootfd) loader_hdl = fdlopen(fd, RTLD_LOCAL); if (!loader_hdl) errx(EX_OSERR, "dlopen: %s", dlerror()); + if (fd != explicit_loader_fd) + close(fd); } int From nobody Mon Jan 22 17:30:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg31Qd7z57r8M; Mon, 22 Jan 2024 17:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJcg26jYcz4fXK; Mon, 22 Jan 2024 17:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ih6srkR6ag6qkTyUmzkx20wPJV5ZBMLhXz8e2WfsMrw=; b=PRTOZpYYMpQ556ZD9c257w0EGRHcPyoIkBlZSzmL3Md2OE9lGpPyb5xYNE/AgIOpGpY3L+ prnZfn7pCAWBlZlrQo5LVjw6nUkoo3D1R6RF4chEdPwKAHozWl/eXF09AGKHbif0ExN0dE +SmvomWfpyUlz/wGy8ae8DdDDZEbTbO/H3q7xF8GPWU6Br7h78ywgVzlA1FlSJRAI49vtE Zef/l/PoGhXNxV4ryDPFHF50W6VRyX9OHs6bjxSMMltidMbb6TGbb5W/quYQ3ch8mW7cmZ c+s9fKKwSyrp87ddNDABbeGELGeXha9vYVZ12nACISCkJtSJj0q/dZVHDbXu2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ih6srkR6ag6qkTyUmzkx20wPJV5ZBMLhXz8e2WfsMrw=; b=ujeWCpOXELTMnV61bVqwdk0mDfsRF+Kh/DV9nKcAaEAAzki7YUsxnQ0gtOpifk6ssmqGgi UyYq4h0R6CEBWpqMErk1Fa4F2aBAofGEJk7GJ+JcW0HerC1Ft7Grs2HGZbCxbNOzrN8I90 R6nMf8+DMi2SAihxW5CmHB33fL1+z6bXdfenn89s15oifZWkLCR+dQJqaZbzSamsWA4wGh jmYvpr2HFDJYg0xFJxkwy0eFdmMWUfc1Gyirle6ge4jG5atsBDPy7PCqmyzJ9xiqUnsOlu 3FiqZXdEYN9NhRGrEocz+9ugvHCLIEYTYy/YfvVLno0R6vUQz008gaRY3nAVaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944606; a=rsa-sha256; cv=none; b=b7Xf98oap7Er2RKMSxo+XfJ1LHzwUkpL/V9FOZk5cCGTV83qh2LQOwRUDQdQsUFm/76CSp 4swQYLGnA4ujn6H11TZk822g/IcjwAcNTmOsx+bw4wRxnfSKahwF7n1ZsipU73giUPRfkE fiMyA4Z9xUusxKM8+ZD/T58S6E2huY7lEzPiLx7E6VFqs+YUSoTbWCcRFuDYQPlP1FoS+D 4btkcQNFHd9tXOqjcYSEYEOdkBpbia7xK60+ONFmmcTnWCFv1li9fTqASspGICvFjKpacV /ya522NhY8g6he+xyC6S5nx8hp7QXewdxcn8Jx40nS97wE/N1ddbkUWJhg3Hsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg25pt0z19PV; Mon, 22 Jan 2024 17:30: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 40MHU6ok009643; Mon, 22 Jan 2024 17:30:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU6n8009639; Mon, 22 Jan 2024 17:30:06 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:06 GMT Message-Id: <202401221730.40MHU6n8009639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: dee3902d1eda - stable/14 - bhyveload(8): document some SECURITY CONSIDERATIONS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dee3902d1edac299d2258b007f245dd91d43d02c Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dee3902d1edac299d2258b007f245dd91d43d02c commit dee3902d1edac299d2258b007f245dd91d43d02c Author: Kyle Evans AuthorDate: 2024-01-12 19:57:53 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:19:18 +0000 bhyveload(8): document some SECURITY CONSIDERATIONS The situation is improved now that we're running in a sandbox, but there is still some host machine access that could be concerning depending on the context. These concerns may be somewhat mitigated by the fact that the host machine usually provides the loader binary, even when the guest image is providing the loader scripts -- they only bring the lua scripts, and they have to be able to execute arbitrary syscalls rather than the interfaces provided by libsa(3). Reviewed by: jhb, markj (cherry picked from commit 5df041c4bbf70d549b055f332630925295ad5aaf) --- usr.sbin/bhyveload/bhyveload.8 | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.8 b/usr.sbin/bhyveload/bhyveload.8 index edeb8ee938f4..54e326e49c8c 100644 --- a/usr.sbin/bhyveload/bhyveload.8 +++ b/usr.sbin/bhyveload/bhyveload.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 24, 2016 +.Dd January 12, 2024 .Dt BHYVELOAD 8 .Os .Sh NAME @@ -171,3 +171,43 @@ at NetApp Inc with a lot of help from can only load .Fx as a guest. +.Sh SECURITY CONSIDERATIONS +Note that in some configurations, +.Nm +will execute guest loader scripts in the context of the host machine. +Note, however, that +.Nm +will enter a +.Xr capsicum 4 +sandbox before it loads the +.Ar os-loader +or executes any loader scripts. +On the host filesystem, the sandbox will only have access to the path specified +by the +.Fl h +flag, the contents of the +.Pa /boot +directory if +.Fl l +was not specified, and the chosen console device. +.Pp +Note that the guest loader scripts are already subject to some limitations that +are not relaxed simply because we are running in userland. +For instance, any I/O on the loader's +.Dq host +device that can be done in loader scripts is limited to the interface that +.Nm +provides, which itself will restrict paths that can be touched to those within +a specified +.Fl h +directory, if any. +Access to files within +.Pa /boot +inside the sandbox would require arbitrary code execution in userboot, and +userboot is usually provided by the host machine rather than anything that is +a part of the guest image. +All access to the +.Fl h +directory as well as +.Pa /boot +is strictly read-only in the sandbox. From nobody Mon Jan 22 17:30:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg3627Pz57r3d; Mon, 22 Jan 2024 17:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJcg33hvQz4fp6; Mon, 22 Jan 2024 17:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfmET8QvefD6cSx3ca5zBHpgq1mDX6OZdaW+ATp9CBQ=; b=YM91kXAbBCObMDmFVV94tXBD2sG4AJss2O+2e30/8Ne8X03p/BqVJKzW7Ibp9RI6IHLfoT 41zxwhaqx8l9g3dxDZiSf+X+jVWn0c+Ne+F4THhr1SRkaCb99l8BSN2CY8hmHy6YNvTE9X hcxDCOImGNbZqq7kfihrguEpaBtuIYugcVgw+VJ8jPMrWXn+ChXA9dOzfF3sLhR0rswJIn B7j71eSUH2Hdos3bbe8uNqzDJIk6ySGG/Ul6bqM8MUSEf+B4L4WmPBzNBer3w8hS3DqCO0 q9mZGsBdozU0e5jqROqpxqtoWpPKVz5rwEPjYgKomnDsnXoebuW08KCbQWx+Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfmET8QvefD6cSx3ca5zBHpgq1mDX6OZdaW+ATp9CBQ=; b=pSoVV5ex4Y1TFUylGY6I8WQsdkrLErh+TGEl132xf3P82YMT1tz/Xo4hd7aEnMp7UVN5kc oSoMjDVnIwOaftWwnCnwHQn3jkw0lawD0h/6kNUetSR9I6X0XNPktqVN+Z+AgsPu6XmO+w smx9vFFIs4lhHVkl3N0c85sUtmxLIaiY+qVxXUeiAUUaYzoDm/C0tzsYrCHBSGA1VE2/cx 8+lCYOIMGLYAiR4WDWshdHr7mVFJR1GMbwib55g+OfCPvGU5uWkuji5weuHDjUeOCHyT+m PJXyREPe2nQCEBMcMKBZNgtx5jKnoHige7OEpk4H5DQw2ek1vdUCA15/BjI8PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944607; a=rsa-sha256; cv=none; b=dSNLx7JeAFh0rgUpPce/7rVIVynvigGCJKTdZVuS3AAfViFlVVkpYdE80UIgWRT2DEhPWP gz5R3wIW8a1AAs0jPB6tW/S55BRK8b3OEQdO7KRZed3ZytvGnPSIW3weZZM3Th2UY5Wahw v8bQ9EGdEHTRekiAbtiPaXskMuWtb476Cn8ghMIGKirsVnkMfJs144IjAYUgg2rTWMQTKy CwdD4D5mlcRkoehFwlHYmEPO0RyLyrTTLMKC8tzD67n58f4xsXyAmTQrxCw0TbysNmYq5t Em1Jqri6w2LpfEJk9lVm1mFjpzD9Ws3zg7sUy4uLg6AOwYJVCrmBTCCLnlFpwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg32nqyz19lv; Mon, 22 Jan 2024 17:30:07 +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 40MHU7On009801; Mon, 22 Jan 2024 17:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU7dR009798; Mon, 22 Jan 2024 17:30:07 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:07 GMT Message-Id: <202401221730.40MHU7dR009798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 979c1cdb405d - stable/13 - bhyveload: make error printing consistent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 979c1cdb405d3d219b2b5b7b3d4480fd876e78e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=979c1cdb405d3d219b2b5b7b3d4480fd876e78e2 commit 979c1cdb405d3d219b2b5b7b3d4480fd876e78e2 Author: Kyle Evans AuthorDate: 2024-01-08 17:49:40 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:52 +0000 bhyveload: make error printing consistent Previously we used a mix of perror(3) + exit(3) and err(3); standardize on the latter instead. This does remove one free() in an error path, because we're decidedly leaking a lot more than just the loader name there (loader handle, vcpu, vmctx...) anyways. Reviewed by: markj (cherry picked from commit a4a838a31ac24e19c8ee68d45cf5234615d0b958) --- usr.sbin/bhyveload/bhyveload.c | 49 ++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index f2a91f95ce89..0c37bd6989e4 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -858,18 +858,14 @@ main(int argc, char** argv) need_reinit = 0; error = vm_create(vmname); if (error) { - if (errno != EEXIST) { - perror("vm_create"); - exit(1); - } + if (errno != EEXIST) + err(1, "vm_create"); need_reinit = 1; } ctx = vm_open(vmname); - if (ctx == NULL) { - perror("vm_open"); - exit(1); - } + if (ctx == NULL) + err(1, "vm_open"); /* * If we weren't given an explicit loader to use, we need to support the @@ -879,10 +875,8 @@ main(int argc, char** argv) cap_rights_t rights; bootfd = open("/boot", O_DIRECTORY | O_PATH); - if (bootfd == -1) { - perror("open"); - exit(1); - } + if (bootfd == -1) + err(1, "open"); /* * bootfd will be used to do a lookup of our loader and do an @@ -890,17 +884,13 @@ main(int argc, char** argv) * to the more usual lookup rights. */ if (caph_rights_limit(bootfd, cap_rights_init(&rights, - CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) { - perror("caph_rights_limit"); - exit(1); - } + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) + err(1, "caph_rights_limit"); } caph_cache_catpages(); - if (caph_enter() < 0) { - perror("caph_enter"); - exit(1); - } + if (caph_enter() < 0) + err(1, "caph_enter"); /* * setjmp in the case the guest wants to swap out interpreter, @@ -916,26 +906,19 @@ main(int argc, char** argv) if (need_reinit) { error = vm_reinit(ctx); - if (error) { - perror("vm_reinit"); - exit(1); - } + if (error) + err(1, "vm_reinit"); } vm_set_memflags(ctx, memflags); error = vm_setup_memory(ctx, mem_size, VM_MMAP_ALL); - if (error) { - perror("vm_setup_memory"); - exit(1); - } + if (error) + err(1, "vm_setup_memory"); loader_open(bootfd); func = dlsym(loader_hdl, "loader_main"); - if (!func) { - printf("%s\n", dlerror()); - free(loader); - return (1); - } + if (!func) + errx(1, "dlsym: %s", dlerror()); tcgetattr(consout_fd, &term); oldterm = term; From nobody Mon Jan 22 17:30:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg46Qflz57r1N; Mon, 22 Jan 2024 17:30: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 4TJcg44GnLz4fgq; Mon, 22 Jan 2024 17:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQ86veFXXO+w8etiFrjOoWiptnGGT1GZb/eKPoRz90o=; b=ur5ZJ47aQs1sEMD9uyhcVLZ9pPuea8dO8ib636tDB5UY6PhWl36aqorpQBCXw5JfewBGox z/wgnVL8veJQiIST5ZrmBlfirIpwgIeA0yT8ZKGNhlqFLGOYWNpCujyKAk04dV4VXfqfvj roE0UuxkJhKAvXwLivgRPy28/SMhkYqijnI1mJwtTpy31NRe8pOMmXDhorxBVGWOxx4HZ0 dpK4L7WnkGW91mEfWCdnWCaTma63uR/p0rahHKWr8rTyfPYxNhzO1dLDU9+cHU8a28lZlU lAr6u+Tx1joLDKhMwlF1hpLC+V0/j01cffJeekLwVACJ3E82U65SbnGKe9z55w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQ86veFXXO+w8etiFrjOoWiptnGGT1GZb/eKPoRz90o=; b=e/887DbLRvXHYuuSVRVekxVRV0sMsjbJdkHn/mHmTuS5EWgaaeLSRvULN7nr5GVZChaYsN AYjaVFfB+fdDPQ0A+hQqmrkDMYAyGge/15yQg1pbzdvCHv4p05NV1h0XgUvLR9Rjf1gn2p PZ54vy6uNaqRAQTzLfrh8GrbU6mPkIju0EdHhDBXyqsM/mYHzS+AJsA2insqiBT6w7r3Aw JfT5fxeUpMz4JaTRVn1LJ69Lpfsg9oQqwKEXP2+Fp6yuj52K4JCllzLim6a3FPIqVGClMM CIMUVpfEEvxdBSnw4z9T6G8xVK4EqMKJtiCNqmxFog6L1SxiS8DDxVWcTRTsYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944608; a=rsa-sha256; cv=none; b=VC0EZzPsPZvNrpLoIdPgx4ThtHBZewQPjTW21LHvTG1rw4OY9n+SsvHNaN/ZPob4AgHUAI 5rPq/628dnRQc2FRNhY3LvhR/LOHRCIySOmavI1tYs1cL1Hmn0396hDMtFXArdnA9xtTEM jvVgYRpoyynUJwH0HqRkKrj3MS6i5FFz+gqSZFTiPudfYovqQLijxq2Qotz1Wb7RCOdxxY KkLer5V14uf1TF4MtZk+KGofQ5YCB0P9EiqmI+yl8/VhEV5eVhliM36HdmEsiNioUeFWo+ vBNFTFNRgeQgQBc261bzKuSrliZzJkvN3G4u1/mZeM9aOR+WnEQ9pyXvcVLibg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg43NQQz19PW; Mon, 22 Jan 2024 17:30: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 40MHU8xu010133; Mon, 22 Jan 2024 17:30:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU8tS010129; Mon, 22 Jan 2024 17:30:08 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:08 GMT Message-Id: <202401221730.40MHU8tS010129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6b23df1a398f - stable/13 - bhyveload: add CAP_SEEK to our dirfd rights List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b23df1a398ff29db25fc988857d846a879f277a Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6b23df1a398ff29db25fc988857d846a879f277a commit 6b23df1a398ff29db25fc988857d846a879f277a Author: Kyle Evans AuthorDate: 2024-01-09 03:08:16 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:53 +0000 bhyveload: add CAP_SEEK to our dirfd rights In the case of hostbase_fd, this is infact a bug fix; we have a seek callback that the host: filesystem may use in loader, and we really don't have a good excuse to break it. bootfd-derived fds will only be used with fdlopen(3) and rtld doesn't seem to need pread / lseek at all for it today, but there's no reason to break if it finds a good reason to later. Suggested by: markj (cherry picked from commit cef5e56f3fea33d6c421276af49f2967453ad4ff) --- usr.sbin/bhyveload/bhyveload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 0c37bd6989e4..dbc4240eaa8a 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -752,7 +752,7 @@ hostbase_open(const char *base) err(EX_OSERR, "open"); if (caph_rights_limit(hostbase_fd, cap_rights_init(&rights, CAP_FSTATAT, - CAP_LOOKUP, CAP_READ)) < 0) + CAP_LOOKUP, CAP_PREAD)) < 0) err(EX_OSERR, "caph_rights_limit"); } @@ -884,7 +884,7 @@ main(int argc, char** argv) * to the more usual lookup rights. */ if (caph_rights_limit(bootfd, cap_rights_init(&rights, - CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) + CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_PREAD)) < 0) err(1, "caph_rights_limit"); } From nobody Mon Jan 22 17:30:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJcg601XWz57r6p; Mon, 22 Jan 2024 17:30: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 4TJcg54pXgz4fpb; Mon, 22 Jan 2024 17:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKxhu5+RhO4C0Yj+NVPRa9DnqWF/LKu+tjHvS2n/H84=; b=bPXBbxjUpQk0sljTDDPMiMfJ4k6fKwbuUJnRKC+fyvy5a99qdsfTFpH3jJqB8Yo212gQtQ w1onjxLxk5OkYtmXjq/Y20WQCbEvDaJ05esA67rDJLFSGUhILE6352+hRAG9FY2Y4lGU4W fajDKU4SeI/6BpxSVBtc+8LAVOiTbKKYbvYyRnY4AeY+tG72tSYTF0eDnOkSVKaz+skZYK 04gwGBaRucipmDH3Ao0lRjGwUuGvGxX2nSDKnJUpKb+QzY0iflqMc1T3jXQ6peST9r3+YM 14yNJABDeS4gvcKNlmqyQ9J3fNjiXSwy0W+s5Sn7L8xg4Kl/dg41q5D7pzA1gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKxhu5+RhO4C0Yj+NVPRa9DnqWF/LKu+tjHvS2n/H84=; b=gWQCPawQwTtu65Pi4Z9zIZcSzZtEIa+PIWuVA7p8fxpA7qtAHKevNMIECPL8jJKP6oY46e QLu4tLfw+BUuaR83l22dK6wTGHoa05zoiCOHtVmdN2Ds6KAwqoqysDAvdC9y29hEiiSDFe s6MAqlyTJt9dcbVMVa6MXT15B6mQWvxdBtxKou3ycXwAOPg4TZGiIRXmsHfdXHqTlLMN42 qhneRrG0UObdUlI1lL115p4tDjvwrP8VGCHNm5xxR7zxJmPKXk27V621cWP9LocJsr+Asc 0yWCUmIJH/KZHbG2zVKMa+ehD3M+/PQfg56BV/rJghv8AWkg3B66vqY2k8yLRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944609; a=rsa-sha256; cv=none; b=nXM0m+mNRvkpLEKdRz4SZuiFXeazZp156n0SC3AIfk9rOdbKK8cdQ/XIvqLQZ7LqE876ni 31kdGKirc5wu0JzD9+6vCj+Td5jUCQ7/ymLLs8r2PE3sdRliNUBia0AN1viPnPYX1L/QvR eC9viKfmCPHlOHCrma7ytSaJoVUZsg9Utk7vqs5msXRc1VBx9fXXM+5KRsD59J+e+6C2hk YbwkH+JNttgCLO+8mHuDD4VrC4tG3sK1uNaHYu/lyQ+7OOhsoF8BkclvDKWeIjqruc/YQu 0YST/Svsj+MpCD4aKKlFp16XhFy1zuvyQn/WCu8BRyTtpodlo6J/1/IR3r7CzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJcg53wYxz19kR; Mon, 22 Jan 2024 17:30: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 40MHU9vN010615; Mon, 22 Jan 2024 17:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHU9qq010606; Mon, 22 Jan 2024 17:30:09 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:30:09 GMT Message-Id: <202401221730.40MHU9qq010606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7b48fa60a578 - stable/13 - bhyveload(8): document some SECURITY CONSIDERATIONS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b48fa60a578a97d5d945290ba09ccc505f6bc8c Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7b48fa60a578a97d5d945290ba09ccc505f6bc8c commit 7b48fa60a578a97d5d945290ba09ccc505f6bc8c Author: Kyle Evans AuthorDate: 2024-01-12 19:57:53 +0000 Commit: Kyle Evans CommitDate: 2024-01-22 17:17:53 +0000 bhyveload(8): document some SECURITY CONSIDERATIONS The situation is improved now that we're running in a sandbox, but there is still some host machine access that could be concerning depending on the context. These concerns may be somewhat mitigated by the fact that the host machine usually provides the loader binary, even when the guest image is providing the loader scripts -- they only bring the lua scripts, and they have to be able to execute arbitrary syscalls rather than the interfaces provided by libsa(3). Reviewed by: jhb, markj (cherry picked from commit 5df041c4bbf70d549b055f332630925295ad5aaf) --- usr.sbin/bhyveload/bhyveload.8 | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.8 b/usr.sbin/bhyveload/bhyveload.8 index edeb8ee938f4..54e326e49c8c 100644 --- a/usr.sbin/bhyveload/bhyveload.8 +++ b/usr.sbin/bhyveload/bhyveload.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 24, 2016 +.Dd January 12, 2024 .Dt BHYVELOAD 8 .Os .Sh NAME @@ -171,3 +171,43 @@ at NetApp Inc with a lot of help from can only load .Fx as a guest. +.Sh SECURITY CONSIDERATIONS +Note that in some configurations, +.Nm +will execute guest loader scripts in the context of the host machine. +Note, however, that +.Nm +will enter a +.Xr capsicum 4 +sandbox before it loads the +.Ar os-loader +or executes any loader scripts. +On the host filesystem, the sandbox will only have access to the path specified +by the +.Fl h +flag, the contents of the +.Pa /boot +directory if +.Fl l +was not specified, and the chosen console device. +.Pp +Note that the guest loader scripts are already subject to some limitations that +are not relaxed simply because we are running in userland. +For instance, any I/O on the loader's +.Dq host +device that can be done in loader scripts is limited to the interface that +.Nm +provides, which itself will restrict paths that can be touched to those within +a specified +.Fl h +directory, if any. +Access to files within +.Pa /boot +inside the sandbox would require arbitrary code execution in userboot, and +userboot is usually provided by the host machine rather than anything that is +a part of the guest image. +All access to the +.Fl h +directory as well as +.Pa /boot +is strictly read-only in the sandbox. From nobody Mon Jan 22 18:05:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJdRN0WLsz57v6s; Mon, 22 Jan 2024 18:05: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 4TJdRM6m16z4nXS; Mon, 22 Jan 2024 18:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705946703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awDVNGzV5WnnusoxNiXRgaYoRjNTXNm65tkWuj86yVM=; b=DYMLH4d+2f0y6TEboZzDJTJkDYwKxsBo6aNQez+TtO1lskgL+eevEI49c0+CcI2W1nwy+i WW4trbbOKoB7qr5hw80zYj9XpPl9qncoMDidMwW6lcdsX10SAL7aZUg9qREBP5VA3DSCs4 HYQG2nrvq//mAbWlPeBHWidOukFuTLmawiJVfWpik8eYmNZkAggmtcHJRs1GiJqGvSyDae mkrtHjZeAqoE0UGGXknMhdd2Z8e4EcBCnovSMslCw7BLZpIVCkMtD8ROBUbjPKgo2gZ720 5mAtsNobHLz9JWcBN6Cq3aC1Fee9FtLtkaDeJbDg+85qWgJuIvNXR9zBgmQkog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705946703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awDVNGzV5WnnusoxNiXRgaYoRjNTXNm65tkWuj86yVM=; b=iVzQFQqmb7AKIhx7CqzIj88ok61DFtdfpMDYKJyEGJ7mme+qtt9QKHga91Ryafwg8xdvFh RlpTaTolSJl4FJbDlEu6QCEBorc66/XP5t9U8f2Lm+Ms3AMknN4AiY5jJItEkBkVchRygc t9H9y4DafFIHW6EuqUMIwh/Q803gNpTq09dAYxzRQqVJCyM7aOq3AlSaQJ46ieTdGlwTGB Ryn0qftBCRstjGF7Nbs4Yd3yzrCQqMmdvceq14wZWDZ9VhXVkocDQqOeJM1iO+fueellBI 5d5GvLbaH3jvdyN6OXvFYzDxb0zjTZUc2pRWo6qik/CErqqGOsqih+5KQESbAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705946703; a=rsa-sha256; cv=none; b=jPtZ1u8khxM0F3+Bpn7ebmOApTjnRdab1zZTBA6DSV0gWvDgyo7bC/KtBourdFyT3mM5mC TLBYtSv9zXVl+oo5UG/j+fKqNJKuQ+0mQUwlmX2KeF3Hq9y822TB85vB0wRyYCy2ivYblL nEp1hYCed2+M28/UsmFQrXafYHWdC3KhOolGQO7wRKUJexMnc2fZfxLzilMefj2IBk2KgB 6BlKOra93MR5dnDVALwgiNQMF+eDzkaMwF5gdhPfknOSjCyAU4eMagKdqup92thB0lb4qm qH0VhaQF9FbScZx+vHxlnblz3WcCECnnMjLF/PRO9tr0yU9uJmTnQH9ytd3pFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJdRM5pjYz1BN8; Mon, 22 Jan 2024 18:05: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 40MI53q3075731; Mon, 22 Jan 2024 18:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MI53en075728; Mon, 22 Jan 2024 18:05:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:05:03 GMT Message-Id: <202401221805.40MI53en075728@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: c738eac52e05 - stable/14 - arm64: fix db_read_bytes() for size == 8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c738eac52e05204e443841cf1ae6cce32c6a7525 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c738eac52e05204e443841cf1ae6cce32c6a7525 commit c738eac52e05204e443841cf1ae6cce32c6a7525 Author: Mitchell Horne AuthorDate: 2024-01-17 16:45:41 +0000 Commit: Mitchell Horne CommitDate: 2024-01-22 18:04:26 +0000 arm64: fix db_read_bytes() for size == 8 There is a mistake in the cast, resulting in a truncated read to tmp64. Switch from int to uint64_t, and adjust the other casts for clarity. Add a comment explaining why we do this at all. Reported by: dfr Reviewed by: dfr, mmel, emaste, jhb (all a previous version) PR: 276406 Fixes: a67687fcd8f5 ("Use native-sized accesses when accessing memory from kdb") Differential Revision: https://reviews.freebsd.org/D43479 (cherry picked from commit 9c2e1a54f71a399fc4645c4b8bed044705629143) --- sys/arm64/arm64/db_interface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/db_interface.c b/sys/arm64/arm64/db_interface.c index 24ce0327e086..01bbd7835450 100644 --- a/sys/arm64/arm64/db_interface.c +++ b/sys/arm64/arm64/db_interface.c @@ -125,14 +125,20 @@ db_read_bytes(vm_offset_t addr, size_t size, char *data) if (ret == 0) { src = (const char *)addr; + + /* + * Perform a native-sized memory access, if possible. This + * enables reading from MMIO devices that don't support single + * byte access. + */ if (size == 8 && (addr & 7) == 0) { - tmp64 = *((const int *)src); + tmp64 = *((const uint64_t *)src); src = (const char *)&tmp64; } else if (size == 4 && (addr & 3) == 0) { - tmp32 = *((const int *)src); + tmp32 = *((const uint32_t *)src); src = (const char *)&tmp32; } else if (size == 2 && (addr & 1) == 0) { - tmp16 = *((const short *)src); + tmp16 = *((const uint16_t *)src); src = (const char *)&tmp16; } while (size-- > 0) From nobody Mon Jan 22 18:07:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJdVQ3hYgz57vFp; Mon, 22 Jan 2024 18:07: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 4TJdVQ2v5Pz4p2B; Mon, 22 Jan 2024 18:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705946862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akURnw2c+uxX1XGLJnMIlCsfLqODKEbEywBfH955GMM=; b=Z44joHIC/n+I+r4I4vk0j/uFphvXi47o354jKj997q8hmUD1a3M9DcoocAH8Wk6uLGtSa8 wHT4GDlb2vQdcodX+dpwtcMrG/4vKvbjOxFEmaSotoUHlX9GbEqSyjeeXF71YHAJJ8E+xY GcBo+iRMc/7xskTPEooYpT62jEnhG/LKgi//e+UCA3xUZvlvefAALU+rrwlIBwQ2U/n6Ft bGBLyT/o0SlaBe3pHE5lneViaBMnI+9p6DqhIOPSh+8XHZLlfLBxGK33VMJy9IWpx3Y96q H3uTaZBsYZt0BR//IsK3zRzhZwQHwsiHydIOqN0m+AfReVbNxWXoLJ+a2c38aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705946862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akURnw2c+uxX1XGLJnMIlCsfLqODKEbEywBfH955GMM=; b=nkiPXvIdpYm1mZveTqmuzT7bU9MXtk4b7QI23C4pq7FzmT8ywRQliCn5ZOAj/q92+GWPaq 1h3X/5aBzze6ApyYTgRca/7ud1ONTjjcWFIXzsbQNJ9jEKhYolrLY88tKsLctNEsKMmBHX 8Y7TN+Z9QPGyPE1rJUKqgQYaBz7+v+45aeJHMf3OVZ0WYWH5+QjCMjVHZbdoumZ5m0O4Ho FyTfXb1KNO4kTGLWW/AqWOfjVcAtrtbzwQ4AGKPyUAL6aNmhuBOWyzkvH3YUhkep6DcyeD EiXZIhfymKH5mKNjFB6fVznWO31827gDGi1UvcQuhcZIm0ZsmLrV6Q0PGOtw6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705946862; a=rsa-sha256; cv=none; b=JIeIsGk8YA7skZck67THOikt8i1qDe3RiItqHs6rgGe9qI//iV7YX/L0jXD3OFB1oisouh oHokF8IyDsK3+nX1uQEbCMauTrTspNdOmxAnLqXXqQxhYC7y7kzFY70MhEjOt86qEWF/Tn aLxXiJlieWRPQC+y4UzI8rwfZLq6VMmuBolIAKSvfw7nuMLck+SgCN9hb/iVio90hpj93l 58Yj17RX+lMntlXjmDyHd019B9+bGUOV2NbkoyMH6oz6+BlD8bNS3aWkjlwR8x4jKoIlcN qricS5BNCAbCN52AyHnH5672bzIqv5okLWqCT/qAD7ldzx6395JZn/FjwAlZSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJdVQ1yzvz1Bl0; Mon, 22 Jan 2024 18:07: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 40MI7gZ6076200; Mon, 22 Jan 2024 18:07:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MI7gDE076197; Mon, 22 Jan 2024 18:07:42 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:07:42 GMT Message-Id: <202401221807.40MI7gDE076197@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: 4057fb12a1d7 - stable/13 - arm64: fix db_read_bytes() for size == 8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 4057fb12a1d7147b85062ad9f3916138c3956cf3 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4057fb12a1d7147b85062ad9f3916138c3956cf3 commit 4057fb12a1d7147b85062ad9f3916138c3956cf3 Author: Mitchell Horne AuthorDate: 2024-01-17 16:45:41 +0000 Commit: Mitchell Horne CommitDate: 2024-01-22 18:05:27 +0000 arm64: fix db_read_bytes() for size == 8 There is a mistake in the cast, resulting in a truncated read to tmp64. Switch from int to uint64_t, and adjust the other casts for clarity. Add a comment explaining why we do this at all. Reported by: dfr Reviewed by: dfr, mmel, emaste, jhb (all a previous version) PR: 276406 Fixes: a67687fcd8f5 ("Use native-sized accesses when accessing memory from kdb") Differential Revision: https://reviews.freebsd.org/D43479 (cherry picked from commit 9c2e1a54f71a399fc4645c4b8bed044705629143) --- sys/arm64/arm64/db_interface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/db_interface.c b/sys/arm64/arm64/db_interface.c index 0c369ba87709..65af5395500e 100644 --- a/sys/arm64/arm64/db_interface.c +++ b/sys/arm64/arm64/db_interface.c @@ -125,14 +125,20 @@ db_read_bytes(vm_offset_t addr, size_t size, char *data) if (ret == 0) { src = (const char *)addr; + + /* + * Perform a native-sized memory access, if possible. This + * enables reading from MMIO devices that don't support single + * byte access. + */ if (size == 8 && (addr & 7) == 0) { - tmp64 = *((const int *)src); + tmp64 = *((const uint64_t *)src); src = (const char *)&tmp64; } else if (size == 4 && (addr & 3) == 0) { - tmp32 = *((const int *)src); + tmp32 = *((const uint32_t *)src); src = (const char *)&tmp32; } else if (size == 2 && (addr & 1) == 0) { - tmp16 = *((const short *)src); + tmp16 = *((const uint16_t *)src); src = (const char *)&tmp16; } while (size-- > 0) From nobody Mon Jan 22 18:20:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJdmk1PgRz57wll; Mon, 22 Jan 2024 18:20: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 4TJdmk0wLHz4r58; Mon, 22 Jan 2024 18:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705947606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IE+ehwLtOheG8bKkZzRtFvcvDqyQWaHwrLqKcnMwcFY=; b=teaKNdNziQ1lPDoKU8gAWUfJwugPA88pn8A4oXFNFooodsu4uESykpanqaZgUVJVwgHeL9 gO8nqh8X8fM9nALjL1o4XW4wUcJfeQS6aCyDxamASA4ZuMK13E85p5ilfCmAhGiWXk7DId meq8+1zCZ/KA3IZJKqwH2AcNJdYGPBO+doAWiC0t9Jw9UPj23FtcLai5fNRfJPX+W9u8my z/dHiY2cdwyn9jZncXOAxJ0+JNE+X8sSELL3ICzTu9/Wv4RSx2LeM7O4RGgdl6k1jRg0fq XJrUw8O5+t3F5Ta+FGJMJ7YPRTysMej0KfvTte6Pu9whJLWnGxZxdajHRFj6oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705947606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IE+ehwLtOheG8bKkZzRtFvcvDqyQWaHwrLqKcnMwcFY=; b=J8G7bESHYVOhOuS78K0N9CNsN/f1jFUIen/PtVEJy0D9GUZuC8b9F6EENk4LI2IWxqCvPe kCdK9qs3kdk0D2Om1VVkNj2hxiCZBOb7LeWeJy1e7CNzfQB3XNSehdmTK+DTetr/XpgWLL AGiaek7OU1oQ0hK+XvM5TdmYAqKbyPpD3EPVLRy3j7QQYg7lgIZ1zuRk162EIWzW10085W S8yTpXMYvbI4LxlD/Bn67SxtDegl7xgBFTqgS4S+gb/RZcl/oduvMmH/nA0JbsR4hiv5wJ xRIe3VwvTAxhc5aeGq/mlYRuonfYmu7yoMvy8ORjfzrgWLXcnNbvaipGOmbC2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705947606; a=rsa-sha256; cv=none; b=UdQO0tti7FRPdTq/JLZm3FBtOARQ4DKNVR0bvtEfD+jU1TG+GUB18ylGkZSiRnFaKdjsps dH60zJ1CSQ9g92e9IwLbRjnWlyaPqrxSVck2ByAkuu8Gkgkl72SrCpIoPLwoX06Dxup4/5 vFd0lHdo06sEfjwe+X1l4WJ1opik5D9drrT+oOwU3KKfCq1ze7GejSD0UlaHKSEj7n2WFJ s4zsVpu3oIM2mw6Z4kSd2ZP1Qu3J5Y9t1LnxkMtbM5eKcaXHrFnctmDR1z2l46bhjVKRK7 l1Pen+ziFDqEa4336U1gtZFJwspojVO0SgLeZmVRHU38cg7hSAFzMkN5b6UfHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJdmj6zphz1C3Y; Mon, 22 Jan 2024 18:20: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 40MIK55l096575; Mon, 22 Jan 2024 18:20:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIK5r5096570; Mon, 22 Jan 2024 18:20:05 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:20:05 GMT Message-Id: <202401221820.40MIK5r5096570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 484e977f2441 - main - pflow: observation domain is an unsigned integer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 484e977f24418afa848d7ea1531b4379446d6065 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=484e977f24418afa848d7ea1531b4379446d6065 commit 484e977f24418afa848d7ea1531b4379446d6065 Author: Kristof Provost AuthorDate: 2024-01-22 16:34:44 +0000 Commit: Kristof Provost CommitDate: 2024-01-22 17:02:10 +0000 pflow: observation domain is an unsigned integer Ensure we print it as such, rather than as a signed integer, as that would lead to confusion. Reported by: Jim Pingle Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pflowctl/pflowctl.c | 2 +- tests/sys/netpfil/pf/pflow.sh | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/sbin/pflowctl/pflowctl.c b/sbin/pflowctl/pflowctl.c index 35daedfdf478..4186598dd9bc 100644 --- a/sbin/pflowctl/pflowctl.c +++ b/sbin/pflowctl/pflowctl.c @@ -340,7 +340,7 @@ get(int id) if (! snl_parse_nlmsg(&ss, hdr, &get_parser, &g)) continue; - printf("pflow%d: version %d domain %d", g.id, g.version, g.obs_dom); + printf("pflow%d: version %d domain %u", g.id, g.version, g.obs_dom); print_sockaddr(" src ", &g.src.storage); print_sockaddr(" dst ", &g.dst.storage); printf("\n"); diff --git a/tests/sys/netpfil/pf/pflow.sh b/tests/sys/netpfil/pf/pflow.sh index 3cef5f5a2d98..10efcbb93ac4 100644 --- a/tests/sys/netpfil/pf/pflow.sh +++ b/tests/sys/netpfil/pf/pflow.sh @@ -282,6 +282,30 @@ rule_cleanup() pft_cleanup } +atf_test_case "obs_dom" "cleanup" +obs_dom_head() +{ + atf_set descr 'Test configuring observation domain values' + atf_set require.user root +} + +obs_dom_body() +{ + pflow_init + + vnet_mkjail alcatraz + + pflow=$(jexec alcatraz pflowctl -c) + jexec alcatraz pflowctl -s ${pflow} domain 2300000000 + atf_check -o match:".*domain 2300000000.*" -s exit:0 \ + jexec alcatraz pflowctl -l +} + +obs_dom_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic" @@ -289,4 +313,5 @@ atf_init_test_cases() atf_add_test_case "v6" atf_add_test_case "nat" atf_add_test_case "rule" + atf_add_test_case "obs_dom" } From nobody Mon Jan 22 18:20:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJdml1dn7z57wc1; Mon, 22 Jan 2024 18:20: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 4TJdml0sL4z4rGH; Mon, 22 Jan 2024 18:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705947607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JZsVyPx7NUNMZ6mLjGOZwJvHx+lOFICZ1WsA97P62iM=; b=EbXhXwLyw6/b0ZhpqMD/48ztmm53ZqE4GhHTHL3LB6rmkfVR1/N/aX44ALhWgZRMZQFHj1 8yD8SrAqsMUXDyYGZOgTZH0FTdg83dm1VoxC8ABp7AlDbIYOahc8qCmftYfeLcxpZyzs2H e2lblM3LnJA4p/PVkt65WxvzCGIBxg3bP8/z9df0Xe5i4hcBV52uCmNwtYJ9d7WiVyn1Wf DAUaHQEo30ci9QPGyr+JGBAFsQvZ0Tt4ciRk/nYY+S+301wD6t7FHT1rH/VL6wBaw1OGGx CnuwD+o5rqnBExheMvC9xe8hh2ezTSTasW020WIgisvUjxCQGypi+Z53/LKEIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705947607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JZsVyPx7NUNMZ6mLjGOZwJvHx+lOFICZ1WsA97P62iM=; b=wDE7KMF7pp78RcurygddjQdfTbAcRqLtswaN81oGb7O9mcBPhdoPWEOCANbaFNnt33O4bB do4pyHx0vWmQvOTk60rCxbtT9Aw+fuNQxYtsJjAu5e6P834y5RPytinVlFwLD6DgnR+mtz esILH0Yb6TistzgQNCVbLcs2vLOOEOkVJ77AkOcVCdlPcIbnVckWMj5z75pi4bh/OEUa2O t8t8ktQ4JyXAkueCW6h9LfK6kbX5QB3vNGRtQI1EE3Dd/z1HPT8kSdQD4V1e3/iUxRreG4 mKiB9T3yIG8M/1YXV7iuyshpgVFDWj8WlWt3g9rRZuX/XMf4rZ1guOlpT9N8iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705947607; a=rsa-sha256; cv=none; b=fCqPH67tD3xHanNCzPK2NHptWOiDJUb/rfXXMlJiexzGlz/gBIXPUs7/09IeK29gdUjM/e gZMxGPHELUPCweHddLSTuqZ3rD61NJwBBDDDBaMVU3z3QiFjpGqYXIN/sIUDz1NSN0+yVY yygKuGZUwuUXa5h34zg5KTVcwA/YvPVooStKlMSYAhmaNMbTebbDKECJZ90zqV9/6GDDE+ jYw7wa9ARzBfltvKvasbP7dGlbSjzQmp9ybZG7kE/OPik2d46qdJpxijjSiJ/3zFwEE5Wr FLet3W41HzkLy8+ojVURXa8bYmTI/WUVAwCIUsuebD15xVCHfQt/GJAz4VDlew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJdmk724lz1BrT; Mon, 22 Jan 2024 18:20: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 40MIK6m0096862; Mon, 22 Jan 2024 18:20:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIK6hm096858; Mon, 22 Jan 2024 18:20:06 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:20:06 GMT Message-Id: <202401221820.40MIK6hm096858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 63a5fe834354 - main - pflow: limit to no more than 128 flow exporters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63a5fe834354dc9249388e0805e6ea68dc9f02c7 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=63a5fe834354dc9249388e0805e6ea68dc9f02c7 commit 63a5fe834354dc9249388e0805e6ea68dc9f02c7 Author: Kristof Provost AuthorDate: 2024-01-22 16:35:54 +0000 Commit: Kristof Provost CommitDate: 2024-01-22 17:02:10 +0000 pflow: limit to no more than 128 flow exporters While there are no inherent limits to the number of exporters we're likely to scale rather badly to very large numbers. There's also no obvious use case for more than a handful. Limit to 128 exporters to prevent foot-shooting. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pflow.h | 2 ++ sys/netpfil/pf/pflow.c | 6 +++++- tests/sys/netpfil/pf/pflow.sh | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/sys/net/pflow.h b/sys/net/pflow.h index 456e3de52ab1..4c194e14e001 100644 --- a/sys/net/pflow.h +++ b/sys/net/pflow.h @@ -39,6 +39,8 @@ #include #endif +#define PFLOW_MAX_ENTRIES 128 + #define PFLOW_ID_LEN sizeof(u_int64_t) #define PFLOW_MAXFLOWS 30 diff --git a/sys/netpfil/pf/pflow.c b/sys/netpfil/pf/pflow.c index 0000aa05ee0d..17a68e0d9e57 100644 --- a/sys/netpfil/pf/pflow.c +++ b/sys/netpfil/pf/pflow.c @@ -176,7 +176,7 @@ vnet_pflowattach(void) CK_LIST_INIT(&V_pflowif_list); mtx_init(&V_pflowif_list_mtx, "pflow interface list mtx", NULL, MTX_DEF); - V_pflow_unr = new_unrhdr(0, INT_MAX, &V_pflowif_list_mtx); + V_pflow_unr = new_unrhdr(0, PFLOW_MAX_ENTRIES - 1, &V_pflowif_list_mtx); for (int i = 0; i < pflow_ncounters; i++) V_pflowstats.c[i] = counter_u64_alloc(M_WAITOK); @@ -1343,6 +1343,10 @@ pflow_nl_create(struct nlmsghdr *hdr, struct nl_pstate *npt) ghdr_new->reserved = 0; unit = alloc_unr(V_pflow_unr); + if (unit == -1) { + nlmsg_abort(nw); + return (ENOMEM); + } error = pflow_create(unit); if (error != 0) { diff --git a/tests/sys/netpfil/pf/pflow.sh b/tests/sys/netpfil/pf/pflow.sh index 10efcbb93ac4..f0552eb061da 100644 --- a/tests/sys/netpfil/pf/pflow.sh +++ b/tests/sys/netpfil/pf/pflow.sh @@ -282,6 +282,37 @@ rule_cleanup() pft_cleanup } +atf_test_case "max_entries" "cleanup" +max_entries_head() +{ + atf_set descr 'Test that we can only create X pflow senders' + atf_set require.user root +} + +max_entries_body() +{ + pflow_init + + vnet_mkjail alcatraz + + for i in `seq 1 128` + do + atf_check -s exit:0 -o ignore \ + jexec alcatraz pflowctl -c + done + + # We cannot create the 129th pflow sender + atf_check -s exit:1 -o ignore -e ignore \ + jexec alcatraz pflowctl -c + + jexec alcatraz pflowctl -l +} + +max_entries_cleanup() +{ + pft_cleanup +} + atf_test_case "obs_dom" "cleanup" obs_dom_head() { @@ -313,5 +344,6 @@ atf_init_test_cases() atf_add_test_case "v6" atf_add_test_case "nat" atf_add_test_case "rule" + atf_add_test_case "max_entries" atf_add_test_case "obs_dom" } From nobody Mon Jan 22 18:22:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJdqq39Ytz57wh6; Mon, 22 Jan 2024 18:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJdqq0wZSz4sP3; Mon, 22 Jan 2024 18:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705947767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CtY0u+oduQ7z40+qDfHuBKdEV4jWFdLEaspv5KkyzQs=; b=rYMLnVu4xYOhHLxStqU62dc06t2/Ryg+k/xo4TA3v2HRTl7/EMkZfov8hwjID9zjEZysof bUiASbCvyRXJAd+bikDmgJWv4LmUzQ3L3Tq35QX1tEN7BVHAXu1XKZkGsbhiQJEGzIUvTd 29ARSqBIvq+gZBHhAmxlWfjfeeoMQh0ueJyo6UOM5osWzt+8JYxFMIGvncXmNdLVsEvWnS 8utL0z8K35V3oHbCHCrh9IYggj8BbmPVC9IJi/KkOFdF6jLlNlLvo9b7qzAs2efvPuTt/z 4oFKVP0m7vwNG+DyI5eg2ZHQh/UR/hEiCu8aQAVEIrkAjZ+e+WOrhB+p7wcTsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705947767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CtY0u+oduQ7z40+qDfHuBKdEV4jWFdLEaspv5KkyzQs=; b=pPgplmuzlmT1It2eKuBFPJCPYQd2Vw5Pr5MF61XHhiU6Amsrs1uYFihX0l91bCDgHZx9da k/Xn3ZBK+5F8eJIArOXqkdKAj7EN5aH1et7KxY6eGXPcZ/ipKNLA60neAxr19KiTAixUMO UYzgYLAWRFRgMDOOPA+JkfIkHX+1hyBGvVsmOztddLvZ5zaGIS894CsLIJhJdGqy1NHvXK Nt+xp2hEArgtcr0286ibComG7BWDIUgj2aR8vKW1+xsEugycmBUvp6Irr1NBEy+OgaGRjG zSlibJsQejOFQ6405XbuiMGPX2M4MP7y+WuWWBBwPQ4h+hoFHEICEw3V0ZOcIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705947767; a=rsa-sha256; cv=none; b=Et/l7d+2nk112w+2o227Vje+OaBjFo1fjXItITytKAmTAPqXwoYbs4u9dubOepmT8uMdkO wrML3MIIvqzx1fV2tqVFgxoiE+DR/teSyjqU9sQHl1lqKu5SoncgPT3P52TkTJT0wA9NXH kXp3BoruLFJgbdAh+CWhiZLjcboxVTppn12Waascaa8pIa9eQiQEQ/foHyhSYAGmjbAiH6 kVjKE3P2ajkmgxY5H2YToZXQiR8B4XB0DNiNr3zevG4KYDtcOI3QgDIZdBj64pkN0+SdII anB+nLnK+HwrdJWaLybyj2sP+5hajTx9SbD4xUeeqXDKegb19W09yAt/rIhlTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJdqq01Vrz1CHS; Mon, 22 Jan 2024 18:22:47 +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 40MIMkFq009843; Mon, 22 Jan 2024 18:22:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIMkhu009840; Mon, 22 Jan 2024 18:22:46 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:22:46 GMT Message-Id: <202401221822.40MIMkhu009840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 166bc357c6a4 - stable/13 - routing: plug mbuf leak for the packets hitting IPv6 blackhole route List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 166bc357c6a4813e7c03ecaea54d7ef6508e7132 Auto-Submitted: auto-generated The branch stable/13 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=166bc357c6a4813e7c03ecaea54d7ef6508e7132 commit 166bc357c6a4813e7c03ecaea54d7ef6508e7132 Author: Alexander V. Chernikov AuthorDate: 2023-05-17 09:06:04 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-22 18:21:34 +0000 routing: plug mbuf leak for the packets hitting IPv6 blackhole route Reported by: Dmitriy Smirnov Tested by: Dmitriy Smirnov MFC after: 1 day (cherry picked from commit b50e1465e88dcf5f6f008892d802df010e7029d1) --- sys/netinet6/ip6_forward.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 7415c72d9aea..8c5748533a77 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -196,9 +196,12 @@ again: if (nh->nh_flags & (NHF_BLACKHOLE | NHF_REJECT)) { IP6STAT_INC(ip6s_cantforward); - if ((nh->nh_flags & NHF_REJECT) && (mcopy != NULL)) { - icmp6_error(mcopy, ICMP6_DST_UNREACH, - ICMP6_DST_UNREACH_REJECT, 0); + if (mcopy != NULL) { + if (nh->nh_flags & NHF_REJECT) { + icmp6_error(mcopy, ICMP6_DST_UNREACH, + ICMP6_DST_UNREACH_REJECT, 0); + } else + m_freem(mcopy); } goto bad; } From nobody Mon Jan 22 18:45:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJfKx70Bzz57yx5; Mon, 22 Jan 2024 18:45: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 4TJfKx6L3cz4v2Q; Mon, 22 Jan 2024 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3e8e0SqRX+sTEw+ITC4hGuVPCGPT41qVM8XEn5KquHY=; b=DNcQ/9ccbx0u1RkYDgIBX/oQm3LWIhIeyyxBcVkv3AInYa/Szs2u5BkNonZqQXuysyPiJi GJyfAFbYztqYD7x8WzfkFybUNNZihs/naxtvSMbts5xlqVaBOPdGxWTMTFfLG4GW0Q1MY5 N5Cb3IuaENOVwA32twWWNWz8KB2iAWcfQdvT/att5vYcCHL8J5kcCKx2DLgDnnAmt6sOlr /1k8hrCMKD9EhkedEhguMYdrEf1zghYyPj58h9OufrnqKsXi3e9h5LiPRYTmf4rg00FPoY obV12aNrwZWsXp8MkiAwhtTCIJAdrWCL8UBv6MMyT3dl5FPYgRQAy5JgswzdTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3e8e0SqRX+sTEw+ITC4hGuVPCGPT41qVM8XEn5KquHY=; b=eKJtMdX0umS9UTjorjcb8S9kom5PVrTC4KFmuy7KpXwlujqkS7I9k/lWbApqZmvxjW/qm0 gIdXh0WzfdmIFuznnpnUU8HU/KtQrhcli2J1dEzijLcv9c+RZrQxxIoPjbbRR8BKC1136V t4R7e7jHGmo7xZdMHhUGKSKUEYp46RorpmV1kmvYfzrSTbJ8GBYa7RhGsJUQYy+v0nETC4 SKGRkOacQ6rInpKHyg7myaaIrPu8ssEo9KVJdV6Q7glbK52SboH5QGK77Dt20/DUKEdLZC /c38ZdpsD3d7I+UgyOTKyDniBpueI00gn4NNXkRaBTtnBbScnpMii+wcs4YcBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705949125; a=rsa-sha256; cv=none; b=gpDRbtVTaUd2jnrK8CeEojy2VAk4MY0dRhvFCsuoOm7mTiffrIak010r0312QzLIVSLApJ d1c0HiwzEZV+jqretPLW5Gy2FjNSgCWOZVocP2BpCtI5kQeR+hnIvQjfvr7eEAI8Q9qslQ ef8gHVdLy62qMBHSHIfWXSZ63NTlm3Fb+lnJLkLiOlztnauCltHgoZxQExKm9zL9OgE2bs U+wH60BCUAJI8qPp3o/q0o/L3yHem5RYSUfg+mRmfTY609Jf0ACsgmZea8dQAcwUx8Eo1m V7vk0JkjDhngD7y1b62UtvnGpXPIpckFpJgdeTATHAUzRboSnbLoe6iWfLrRKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJfKx5NPdz1Cjc; Mon, 22 Jan 2024 18:45: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 40MIjPaN042760; Mon, 22 Jan 2024 18:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIjPNl042757; Mon, 22 Jan 2024 18:45:25 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:45:25 GMT Message-Id: <202401221845.40MIjPNl042757@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: 3e27fcf05793 - stable/13 - inpcb: Remove NULL checks of credential references List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 3e27fcf057937ef93258dc4f8e67a308e02f349c Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e27fcf057937ef93258dc4f8e67a308e02f349c commit 3e27fcf057937ef93258dc4f8e67a308e02f349c Author: Mark Johnston AuthorDate: 2022-11-02 17:03:41 +0000 Commit: Mark Johnston CommitDate: 2024-01-22 18:45:03 +0000 inpcb: Remove NULL checks of credential references Some auditing of the code shows that "cred" is never non-NULL in these functions, either because all callers pass a non-NULL reference or because they unconditionally dereference "cred". So, let's simplify the code a bit and remove NULL checks. No functional change intended. Reviewed by: glebius MFC after: 1 week Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37025 (cherry picked from commit ac1750dd143e53225c518bc1ca0462c3fffe10f6) --- sys/netinet/in_pcb.c | 27 ++++++++++++--------------- sys/netinet6/in6_pcb.c | 10 ++++------ 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 61079db56bdb..3f4ad6752aae 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1154,11 +1154,12 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, NET_EPOCH_ASSERT(); KASSERT(laddr != NULL, ("%s: laddr NULL", __func__)); + /* * Bypass source address selection and use the primary jail IP * if requested. */ - if (cred != NULL && !prison_saddrsel_ip4(cred, laddr)) + if (!prison_saddrsel_ip4(cred, laddr)) return (0); error = 0; @@ -1203,7 +1204,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, goto done; } - if (cred == NULL || !prison_flag(cred, PR_IP4)) { + if (!prison_flag(cred, PR_IP4)) { laddr->s_addr = ia->ia_addr.sin_addr.s_addr; goto done; } @@ -1244,7 +1245,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, struct ifnet *ifp; /* If not jailed, use the default returned. */ - if (cred == NULL || !prison_flag(cred, PR_IP4)) { + if (!prison_flag(cred, PR_IP4)) { ia = (struct in_ifaddr *)nh->nh_ifa; laddr->s_addr = ia->ia_addr.sin_addr.s_addr; goto done; @@ -1305,7 +1306,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, if (ia == NULL) ia = ifatoia(ifa_ifwithaddr(sintosa(&dst))); - if (cred == NULL || !prison_flag(cred, PR_IP4)) { + if (!prison_flag(cred, PR_IP4)) { if (ia == NULL) { error = ENETUNREACH; goto done; @@ -1421,8 +1422,7 @@ in_pcbconnect_setup(struct inpcb *inp, struct sockaddr *nam, faddr = IA_SIN(CK_STAILQ_FIRST(&V_in_ifaddrhead))->sin_addr; IN_IFADDR_RUNLOCK(&in_ifa_tracker); - if (cred != NULL && - (error = prison_get_ip4(cred, &faddr)) != 0) + if ((error = prison_get_ip4(cred, &faddr)) != 0) return (error); } else if (faddr.s_addr == (u_long)INADDR_BROADCAST) { IN_IFADDR_RLOCK(&in_ifa_tracker); @@ -1450,10 +1450,9 @@ in_pcbconnect_setup(struct inpcb *inp, struct sockaddr *nam, ifp = imo->imo_multicast_ifp; IN_IFADDR_RLOCK(&in_ifa_tracker); CK_STAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { - if ((ia->ia_ifp == ifp) && - (cred == NULL || + if (ia->ia_ifp == ifp && prison_check_ip4(cred, - &ia->ia_addr.sin_addr) == 0)) + &ia->ia_addr.sin_addr) == 0) break; } if (ia == NULL) @@ -2006,9 +2005,8 @@ in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr, /* * Found? */ - if (cred == NULL || - prison_equal_ip4(cred->cr_prison, - inp->inp_cred->cr_prison)) + if (prison_equal_ip4(cred->cr_prison, + inp->inp_cred->cr_prison)) return (inp); } } @@ -2039,9 +2037,8 @@ in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr, */ CK_LIST_FOREACH(inp, &phd->phd_pcblist, inp_portlist) { wildcard = 0; - if (cred != NULL && - !prison_equal_ip4(inp->inp_cred->cr_prison, - cred->cr_prison)) + if (!prison_equal_ip4(inp->inp_cred->cr_prison, + cred->cr_prison)) continue; #ifdef INET6 /* XXX inp locking */ diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index a153b06a7435..6d7c1d4b65b5 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -764,9 +764,8 @@ in6_pcblookup_local(struct inpcbinfo *pcbinfo, struct in6_addr *laddr, IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr) && inp->inp_lport == lport) { /* Found. */ - if (cred == NULL || - prison_equal_ip6(cred->cr_prison, - inp->inp_cred->cr_prison)) + if (prison_equal_ip6(cred->cr_prison, + inp->inp_cred->cr_prison)) return (inp); } } @@ -797,9 +796,8 @@ in6_pcblookup_local(struct inpcbinfo *pcbinfo, struct in6_addr *laddr, */ CK_LIST_FOREACH(inp, &phd->phd_pcblist, inp_portlist) { wildcard = 0; - if (cred != NULL && - !prison_equal_ip6(cred->cr_prison, - inp->inp_cred->cr_prison)) + if (!prison_equal_ip6(cred->cr_prison, + inp->inp_cred->cr_prison)) continue; /* XXX inp locking */ if ((inp->inp_vflag & INP_IPV6) == 0) From nobody Mon Jan 22 18:45:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJfKz0MPXz57yx9; Mon, 22 Jan 2024 18:45: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 4TJfKy6v7Zz4vD6; Mon, 22 Jan 2024 18:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IA8WbfLNYxZ/j/lYMPZqSt07JkULneoas8h4OUCsRZs=; b=CPvEKXljzn11hnoYbR0Uy6nqFtt1sl76eHHCM5wjl4a9TlS+Ukmc4tMRm7EgaZII7inWAk w4+ozfqE6LjETlb2HWbU1z1mf64POJOOnnhz7JNO2MqgqNAY6ZFb40oTVI0soGipjfgKcM W8Dn2QbM/T+uwEmcNyClKhA67e46Er0NY6nCGNJD+dsRm77POvWSwyU9fSvZvdqFOiFqVS Ojm6YV1Okpd/FFuoFanqzi+b9jWf4Sc9Ss/4AcY2vtcZzOfBPe+QI5dgFlKl7bpNjEKuQo myj6I+QE1w7xZVck6NUM0IU9SLehm5Ykzxe6Ad5T+DaRK0zfXdTTKj2JvsDgsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IA8WbfLNYxZ/j/lYMPZqSt07JkULneoas8h4OUCsRZs=; b=N8fVFiaJbEwBbDKfgR7Hoj6ZfuWplEhygQ4mrlwlx6HcuHLT8f/JOP3UA8xjAvPBa6GqEC khK+2CSz24SE9awGS8ljww6B+y5L0ktW5iXjC9ffp0tLj2WXbhtIvkYNrhRqS600tmmWDU 1oO05c4J8JUFPuhLy6ZnQzreDnNimR2shg0gatyj7Z9k5v+/rhcyxIJv5sN7RFAl3JLR5i oBtkDQy8AHoZ2H5nWP9VUqf+e+j8cmAWV7WUN+k1gmYCUNNX9Z7tr6+5xMeZ6qLn7rd5MQ tISPScfAL7hxUron/m6P5yyYBY/0ijVEKWlBju/X4p8PKNSwTDBanWB5CELfpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705949127; a=rsa-sha256; cv=none; b=yHtONoaB1lQ9yfYQsPut3L8eN1VRKReUp45vZ9b8ahTy7nubYkrpUaax6PGdMyO+56b3Jh YjJLB34TBdIO8CWhmktlmv02A3ZBoMGmCz4QDfKknLxYAh38JXtiaoAd2xC7VEz9yR3bAA ncAw7n07zmjTAjudcZPGl85nuAOMMIRQ168wB1iL48Ic8MD+EtzmnOkDnNis+e+Pnz/czH yTHNzrJNRx6stZFACkh/XJmblZAgUuB347MXHTVp8NC2N8fqnjRxW7J4n7+iCTXHkW/gXQ 8gWU9YLJK/NVLjbQ3F7Ya7Fb9ikTBnv47lkxDi84waEqq+VVBf4v8P3wfbgOIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJfKy61BJz1CXr; Mon, 22 Jan 2024 18:45: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 40MIjQ1g042823; Mon, 22 Jan 2024 18:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIjQII042821; Mon, 22 Jan 2024 18:45:26 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:45:26 GMT Message-Id: <202401221845.40MIjQII042821@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: 0ea32f0e8376 - stable/13 - inpcb: Remove a PCB from its LB group upon a subsequent error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 0ea32f0e83769ca1c6ebc40fb0a3a0e64a24e7a0 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0ea32f0e83769ca1c6ebc40fb0a3a0e64a24e7a0 commit 0ea32f0e83769ca1c6ebc40fb0a3a0e64a24e7a0 Author: Mark Johnston AuthorDate: 2022-11-02 17:05:14 +0000 Commit: Mark Johnston CommitDate: 2024-01-22 18:45:03 +0000 inpcb: Remove a PCB from its LB group upon a subsequent error If a memory allocation failure causes bind to fail, we should take the inpcb back out of its LB group since it's not prepared to handle connections. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37027 (cherry picked from commit a152dd863418638c3eb08b5c101b10b82f8072f5) --- sys/netinet/in_pcb.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 3f4ad6752aae..3f8db305d3c9 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2646,7 +2646,6 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct inpcbport *phd; u_int32_t hashkey_faddr; - int so_options; INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); @@ -2671,13 +2670,10 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) * Add entry to load balance group. * Only do this if SO_REUSEPORT_LB is set. */ - so_options = inp_so_options(inp); - if (so_options & SO_REUSEPORT_LB) { - int ret = in_pcbinslbgrouphash(inp, M_NODOM); - if (ret) { - /* pcb lb group malloc fail (ret=ENOBUFS). */ - return (ret); - } + if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) { + int error = in_pcbinslbgrouphash(inp, M_NODOM); + if (error != 0) + return (error); } /* @@ -2687,13 +2683,16 @@ in_pcbinshash_internal(struct inpcb *inp, struct mbuf *m) if (phd->phd_port == inp->inp_lport) break; } + /* * If none exists, malloc one and tack it on. */ if (phd == NULL) { phd = malloc(sizeof(struct inpcbport), M_PCB, M_NOWAIT); if (phd == NULL) { - return (ENOBUFS); /* XXX */ + if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) + in_pcbremlbgrouphash(inp); + return (ENOMEM); } bzero(&phd->phd_epoch_ctx, sizeof(struct epoch_context)); phd->phd_port = inp->inp_lport; From nobody Mon Jan 22 18:45:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJfL01GYbz5804G; Mon, 22 Jan 2024 18:45: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 4TJfL0101hz4v7b; Mon, 22 Jan 2024 18:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BV8eFF6BpWiGs3l2Sec+BZaqdTieQBOdmXw9iMlkIZM=; b=JYDstxyC9kJGaqgX49obMrj/wgftRuPi0CWBYpweJ+97GJbbX2oI3lFW/GWcz2U8WgtHCh GK2EvI8q9umWLwgPfJOIyM9DyFa7RinVdbeA3Cn3nFIjyX/UsYAXmZGqCyuzLYD/tzyws9 9O1ai6dbDEn5LJpE9BJSLjE5njodM/OihPOn/ulJmNfOafxP/sHGpVekqCj3IESOSclnEP rdmZS38ZeCXYtyMaGrwvx7YhbASy9GrMEG/Bk+pX7jSymOlnx6yZixiAuwZ6/D42IKG99t c0XqKZavZDwf7JnSQbRf6xMM1yaa0uMeVC0fE/huHEN+4DhLv+kXDIkPErXmJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705949128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BV8eFF6BpWiGs3l2Sec+BZaqdTieQBOdmXw9iMlkIZM=; b=SCAttQXknVLAnlNswbticcaGalNwD32kSY2d7i3Jd1pOOEXMDGZVIlSPfOhg4UxaBEe7dQ IZ/zvrUXEVYtPvFjxdtlsRbRNu30KrvATlGNapA03m4W1eHRQHSZeCof2gsTQr/aUEAlNB e51AjmoX+9on+gM8X6L9GFdR6db+rfZj1BYuBAsaA7Wd9H/XV7ie7Yc7iTCMdO3tPZSZmN ylRX2VuxXLGUM+jvAYbiWhHcFF22VGhV7wmxv0wmow6tpDNX5q9g3c2aMrc6nI2wIOEQJK 5Z5AMOPRH9B1iKCMgExjDhdtqDSrhJP2cj8qCtUI8oxuEd0Mjd2m6k7nSAbtQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705949128; a=rsa-sha256; cv=none; b=yCmW0YgK/y4shvN18P8q437rlKYhmfYDbCOphM++kdTSpzZF8z33Sp/BOxVtO+5tZvBB0D 3eJumNPpjdmyQfwL3913R9oXGmBqYS0v4LS9zyPdYdpMDCbADy0qxeHrlB9cmMq1I2tURa Zc5OolmglB8vlsFL087IgSqIJ0DNGFPR6JTMtk3GqEtw+LDTzvoZoaoUIFhmz21IYQIXR5 bPptXC5+Qb/LFw/ZMh8qr749FSBbj0CrwRZI/mTB9/yzccWyyp5oJvZrVGuSGGKKqQ+8Qi vRWKcJW6YA5nUcntPhapNXCEEuAVNeUxZEngwnHeWJFxHe37aYZYt/1TEIu7Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJfL000cpz1CXs; Mon, 22 Jan 2024 18:45: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 40MIjRm0042874; Mon, 22 Jan 2024 18:45:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MIjRij042871; Mon, 22 Jan 2024 18:45:27 GMT (envelope-from git) Date: Mon, 22 Jan 2024 18:45:27 GMT Message-Id: <202401221845.40MIjRij042871@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: 535984471641 - stable/13 - inpcb: Allow SO_REUSEPORT_LB to be used in jails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 535984471641c9435854ed23a80e49a8bf0e53b0 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=535984471641c9435854ed23a80e49a8bf0e53b0 commit 535984471641c9435854ed23a80e49a8bf0e53b0 Author: Mark Johnston AuthorDate: 2022-11-02 17:08:07 +0000 Commit: Mark Johnston CommitDate: 2024-01-22 18:45:03 +0000 inpcb: Allow SO_REUSEPORT_LB to be used in jails Currently SO_REUSEPORT_LB silently does nothing when set by a jailed process. It is trivial to support this option in VNET jails, but it's also useful in traditional jails. This patch enables LB groups in jails with the following semantics: - all PCBs in a group must belong to the same jail, - PCB lookup prefers jailed groups to non-jailed groups This is a straightforward extension of the semantics used for individual listening sockets. One pre-existing quirk of the lbgroup implementation is that non-jailed lbgroups are searched before jailed listening sockets; that is preserved with this change. Discussed with: glebius MFC after: 1 month Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37029 (cherry picked from commit d93ec8cb1324d04d7cae19fb7fa98ade2ff33c80) --- sys/netinet/in_pcb.c | 126 ++++++++++++++++++++++++++++--------------------- sys/netinet/in_pcb.h | 3 +- sys/netinet6/in6_pcb.c | 99 +++++++++++++++++++++++--------------- 3 files changed, 136 insertions(+), 92 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 3f8db305d3c9..001fd735cb4c 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -254,8 +254,8 @@ SYSCTL_COUNTER_U64(_net_inet_ip_rl, OID_AUTO, chgrl, CTLFLAG_RD, */ static struct inpcblbgroup * -in_pcblbgroup_alloc(struct inpcblbgrouphead *hdr, u_char vflag, - uint16_t port, const union in_dependaddr *addr, int size, +in_pcblbgroup_alloc(struct inpcblbgrouphead *hdr, struct ucred *cred, + u_char vflag, uint16_t port, const union in_dependaddr *addr, int size, uint8_t numa_domain) { struct inpcblbgroup *grp; @@ -263,8 +263,9 @@ in_pcblbgroup_alloc(struct inpcblbgrouphead *hdr, u_char vflag, bytes = __offsetof(struct inpcblbgroup, il_inp[size]); grp = malloc(bytes, M_PCB, M_ZERO | M_NOWAIT); - if (!grp) + if (grp == NULL) return (NULL); + grp->il_cred = crhold(cred); grp->il_vflag = vflag; grp->il_lport = port; grp->il_numa_domain = numa_domain; @@ -280,6 +281,7 @@ in_pcblbgroup_free_deferred(epoch_context_t ctx) struct inpcblbgroup *grp; grp = __containerof(ctx, struct inpcblbgroup, il_epoch_ctx); + crfree(grp->il_cred); free(grp, M_PCB); } @@ -298,7 +300,7 @@ in_pcblbgroup_resize(struct inpcblbgrouphead *hdr, struct inpcblbgroup *grp; int i; - grp = in_pcblbgroup_alloc(hdr, old_grp->il_vflag, + grp = in_pcblbgroup_alloc(hdr, old_grp->il_cred, old_grp->il_vflag, old_grp->il_lport, &old_grp->il_dependladdr, size, old_grp->il_numa_domain); if (grp == NULL) @@ -357,12 +359,6 @@ in_pcbinslbgrouphash(struct inpcb *inp, uint8_t numa_domain) INP_WLOCK_ASSERT(inp); INP_HASH_WLOCK_ASSERT(pcbinfo); - /* - * Don't allow jailed socket to join local group. - */ - if (inp->inp_socket != NULL && jailed(inp->inp_socket->so_cred)) - return (0); - #ifdef INET6 /* * Don't allow IPv4 mapped INET6 wild socket. @@ -377,17 +373,19 @@ in_pcbinslbgrouphash(struct inpcb *inp, uint8_t numa_domain) idx = INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_lbgrouphashmask); hdr = &pcbinfo->ipi_lbgrouphashbase[idx]; CK_LIST_FOREACH(grp, hdr, il_list) { - if (grp->il_vflag == inp->inp_vflag && + if (grp->il_cred->cr_prison == inp->inp_cred->cr_prison && + grp->il_vflag == inp->inp_vflag && grp->il_lport == inp->inp_lport && grp->il_numa_domain == numa_domain && memcmp(&grp->il_dependladdr, &inp->inp_inc.inc_ie.ie_dependladdr, - sizeof(grp->il_dependladdr)) == 0) + sizeof(grp->il_dependladdr)) == 0) { break; + } } if (grp == NULL) { /* Create new load balance group. */ - grp = in_pcblbgroup_alloc(hdr, inp->inp_vflag, + grp = in_pcblbgroup_alloc(hdr, inp->inp_cred, inp->inp_vflag, inp->inp_lport, &inp->inp_inc.inc_ie.ie_dependladdr, INPCBLBGROUP_SIZMIN, numa_domain); if (grp == NULL) @@ -2084,15 +2082,20 @@ in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr, } #undef INP_LOOKUP_MAPPED_PCB_COST +static bool +in_pcblookup_lb_numa_match(const struct inpcblbgroup *grp, int domain) +{ + return (domain == M_NODOM || domain == grp->il_numa_domain); +} + static struct inpcb * in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, const struct in_addr *laddr, uint16_t lport, const struct in_addr *faddr, - uint16_t fport, int lookupflags, int numa_domain) + uint16_t fport, int lookupflags, int domain) { - struct inpcb *local_wild, *numa_wild; const struct inpcblbgrouphead *hdr; struct inpcblbgroup *grp; - uint32_t idx; + struct inpcblbgroup *jail_exact, *jail_wild, *local_exact, *local_wild; INP_HASH_LOCK_ASSERT(pcbinfo); @@ -2100,17 +2103,15 @@ in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, INP_PCBPORTHASH(lport, pcbinfo->ipi_lbgrouphashmask)]; /* - * Order of socket selection: - * 1. non-wild. - * 2. wild (if lookupflags contains INPLOOKUP_WILDCARD). - * - * NOTE: - * - Load balanced group does not contain jailed sockets - * - Load balanced group does not contain IPv4 mapped INET6 wild sockets + * Search for an LB group match based on the following criteria: + * - prefer jailed groups to non-jailed groups + * - prefer exact source address matches to wildcard matches + * - prefer groups bound to the specified NUMA domain */ - local_wild = NULL; - numa_wild = NULL; + jail_exact = jail_wild = local_exact = local_wild = NULL; CK_LIST_FOREACH(grp, hdr, il_list) { + bool injail; + #ifdef INET6 if (!(grp->il_vflag & INP_IPV4)) continue; @@ -2118,27 +2119,47 @@ in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, if (grp->il_lport != lport) continue; - idx = INP_PCBLBGROUP_PKTHASH(faddr->s_addr, lport, fport) % - grp->il_inpcnt; + injail = prison_flag(grp->il_cred, PR_IP4) != 0; + if (injail && prison_check_ip4_locked(grp->il_cred->cr_prison, + laddr) != 0) + continue; + if (grp->il_laddr.s_addr == laddr->s_addr) { - if (numa_domain == M_NODOM || - grp->il_numa_domain == numa_domain) { - return (grp->il_inp[idx]); - } else { - numa_wild = grp->il_inp[idx]; + if (injail) { + jail_exact = grp; + if (in_pcblookup_lb_numa_match(grp, domain)) + /* This is a perfect match. */ + goto out; + } else if (local_exact == NULL || + in_pcblookup_lb_numa_match(grp, domain)) { + local_exact = grp; + } + } else if (grp->il_laddr.s_addr == INADDR_ANY && + (lookupflags & INPLOOKUP_WILDCARD) != 0) { + if (injail) { + if (jail_wild == NULL || + in_pcblookup_lb_numa_match(grp, domain)) + jail_wild = grp; + } else if (local_wild == NULL || + in_pcblookup_lb_numa_match(grp, domain)) { + local_wild = grp; } - } - if (grp->il_laddr.s_addr == INADDR_ANY && - (lookupflags & INPLOOKUP_WILDCARD) != 0 && - (local_wild == NULL || numa_domain == M_NODOM || - grp->il_numa_domain == numa_domain)) { - local_wild = grp->il_inp[idx]; } } - if (numa_wild != NULL) - return (numa_wild); - return (local_wild); + if (jail_exact != NULL) + grp = jail_exact; + else if (jail_wild != NULL) + grp = jail_wild; + else if (local_exact != NULL) + grp = local_exact; + else + grp = local_wild; + if (grp == NULL) + return (NULL); +out: + return (grp->il_inp[INP_PCBLBGROUP_PKTHASH(faddr->s_addr, lport, fport) % + grp->il_inpcnt]); } #ifdef PCBGROUP @@ -2424,16 +2445,6 @@ in_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr, if (tmpinp != NULL) return (tmpinp); - /* - * Then look in lb group (for wildcard match). - */ - if ((lookupflags & INPLOOKUP_WILDCARD) != 0) { - inp = in_pcblookup_lbgroup(pcbinfo, &laddr, lport, &faddr, - fport, lookupflags, numa_domain); - if (inp != NULL) - return (inp); - } - /* * Then look for a wildcard match, if requested. */ @@ -2445,6 +2456,15 @@ in_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr, struct inpcb *jail_wild = NULL; int injail; + /* + * First see if an LB group matches the request before scanning + * all sockets on this port. + */ + inp = in_pcblookup_lbgroup(pcbinfo, &laddr, lport, &faddr, + fport, lookupflags, numa_domain); + if (inp != NULL) + return (inp); + /* * Order of socket selection - we always prefer jails. * 1. jailed, non-wild. @@ -2791,8 +2811,8 @@ in_pcbremlists(struct inpcb *inp) INP_HASH_WLOCK(pcbinfo); - /* XXX: Only do if SO_REUSEPORT_LB set? */ - in_pcbremlbgrouphash(inp); + if ((inp->inp_flags2 & INP_REUSEPORT_LB) != 0) + in_pcbremlbgrouphash(inp); CK_LIST_REMOVE(inp, inp_hash); CK_LIST_REMOVE(inp, inp_portlist); diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index a1ec40d21194..331635fa94fb 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -564,9 +564,10 @@ struct inpcbgroup { struct inpcblbgroup { CK_LIST_ENTRY(inpcblbgroup) il_list; struct epoch_context il_epoch_ctx; + struct ucred *il_cred; uint16_t il_lport; /* (c) */ u_char il_vflag; /* (c) */ - u_int8_t il_numa_domain; + uint8_t il_numa_domain; uint32_t il_pad2; union in_dependaddr il_dependladdr; /* (c) */ #define il_laddr il_dependladdr.id46_addr.ia46_addr4 diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 6d7c1d4b65b5..ee32fbbf1688 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -897,15 +897,20 @@ in6_rtchange(struct inpcb *inp, int errno __unused) return inp; } +static bool +in6_pcblookup_lb_numa_match(const struct inpcblbgroup *grp, int domain) +{ + return (domain == M_NODOM || domain == grp->il_numa_domain); +} + static struct inpcb * in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, const struct in6_addr *laddr, uint16_t lport, const struct in6_addr *faddr, - uint16_t fport, int lookupflags, uint8_t numa_domain) + uint16_t fport, int lookupflags, uint8_t domain) { - struct inpcb *local_wild, *numa_wild; const struct inpcblbgrouphead *hdr; struct inpcblbgroup *grp; - uint32_t idx; + struct inpcblbgroup *jail_exact, *jail_wild, *local_exact, *local_wild; INP_HASH_LOCK_ASSERT(pcbinfo); @@ -913,17 +918,15 @@ in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, INP_PCBPORTHASH(lport, pcbinfo->ipi_lbgrouphashmask)]; /* - * Order of socket selection: - * 1. non-wild. - * 2. wild (if lookupflags contains INPLOOKUP_WILDCARD). - * - * NOTE: - * - Load balanced group does not contain jailed sockets. - * - Load balanced does not contain IPv4 mapped INET6 wild sockets. + * Search for an LB group match based on the following criteria: + * - prefer jailed groups to non-jailed groups + * - prefer exact source address matches to wildcard matches + * - prefer groups bound to the specified NUMA domain */ - local_wild = NULL; - numa_wild = NULL; + jail_exact = jail_wild = local_exact = local_wild = NULL; CK_LIST_FOREACH(grp, hdr, il_list) { + bool injail; + #ifdef INET if (!(grp->il_vflag & INP_IPV6)) continue; @@ -931,26 +934,47 @@ in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo, if (grp->il_lport != lport) continue; - idx = INP_PCBLBGROUP_PKTHASH(INP6_PCBHASHKEY(faddr), lport, - fport) % grp->il_inpcnt; + injail = prison_flag(grp->il_cred, PR_IP6) != 0; + if (injail && prison_check_ip6_locked(grp->il_cred->cr_prison, + laddr) != 0) + continue; + if (IN6_ARE_ADDR_EQUAL(&grp->il6_laddr, laddr)) { - if (numa_domain == M_NODOM || - grp->il_numa_domain == numa_domain) { - return (grp->il_inp[idx]); + if (injail) { + jail_exact = grp; + if (in6_pcblookup_lb_numa_match(grp, domain)) + /* This is a perfect match. */ + goto out; + } else if (local_exact == NULL || + in6_pcblookup_lb_numa_match(grp, domain)) { + local_exact = grp; + } + } else if (IN6_IS_ADDR_UNSPECIFIED(&grp->il6_laddr) && + (lookupflags & INPLOOKUP_WILDCARD) != 0) { + if (injail) { + if (jail_wild == NULL || + in6_pcblookup_lb_numa_match(grp, domain)) + jail_wild = grp; + } else if (local_wild == NULL || + in6_pcblookup_lb_numa_match(grp, domain)) { + local_wild = grp; } - else - numa_wild = grp->il_inp[idx]; - } - if (IN6_IS_ADDR_UNSPECIFIED(&grp->il6_laddr) && - (lookupflags & INPLOOKUP_WILDCARD) != 0 && - (local_wild == NULL || numa_domain == M_NODOM || - grp->il_numa_domain == numa_domain)) { - local_wild = grp->il_inp[idx]; } } - if (numa_wild != NULL) - return (numa_wild); - return (local_wild); + + if (jail_exact != NULL) + grp = jail_exact; + else if (jail_wild != NULL) + grp = jail_wild; + else if (local_exact != NULL) + grp = local_exact; + else + grp = local_wild; + if (grp == NULL) + return (NULL); +out: + return (grp->il_inp[INP_PCBLBGROUP_PKTHASH(INP6_PCBHASHKEY(faddr), lport, fport) % + grp->il_inpcnt]); } #ifdef PCBGROUP @@ -1199,16 +1223,6 @@ in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in6_addr *faddr, if (tmpinp != NULL) return (tmpinp); - /* - * Then look in lb group (for wildcard match). - */ - if ((lookupflags & INPLOOKUP_WILDCARD) != 0) { - inp = in6_pcblookup_lbgroup(pcbinfo, laddr, lport, faddr, - fport, lookupflags, numa_domain); - if (inp != NULL) - return (inp); - } - /* * Then look for a wildcard match, if requested. */ @@ -1217,6 +1231,15 @@ in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in6_addr *faddr, struct inpcb *jail_wild = NULL; int injail; + /* + * First see if an LB group matches the request before scanning + * all sockets on this port. + */ + inp = in6_pcblookup_lbgroup(pcbinfo, laddr, lport, faddr, + fport, lookupflags, numa_domain); + if (inp != NULL) + return (inp); + /* * Order of socket selection - we always prefer jails. * 1. jailed, non-wild. From nobody Mon Jan 22 20:42:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJhxB2HP6z589rT; Mon, 22 Jan 2024 20:42: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 4TJhxB0crQz4F3B; Mon, 22 Jan 2024 20:42:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705956158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOEZJDURVyGSlW1wzkxTpBaQS8OEIYkac1SEYcrru+A=; b=ZgS/Wka7dHATSOahzPRxAzqC+xMwrl5oXHkMJ3BpMqW1hD7ZWX1eP7kHqHwjE5kZLoyAtT jgM/rp35FuCPhqoeYOTzdk8AsjTiOaplu/GieMk2Z2miAjeSvMoJx2qxLPkDKapzj+IxdQ 8G8mGpHHY0Kmvw4hDpQ1m8MjFuQDVaXXLEh6cdnrHNxPI8VYwxlFZzbzP0rfngPSiYnDO+ /zve4yPdDbQhTA4c5dGiLmvVeFKcXtdSW1PqUTq2LKC6dHbunEmLvq2uyUYkSAzo7KNTqA 7Ry14arAcl10rtLVjDbdjenq2jD125zWSsh6HTKvgAfngxItglOnNMPR4SiNvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705956158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOEZJDURVyGSlW1wzkxTpBaQS8OEIYkac1SEYcrru+A=; b=rQgE5mqo5Kp+32qvkHWdNionheguLZZh27zIjA9boCNhhMBRG0OAcZnW/+Hlx2TzPocs9c oblcIvgtA/n1D0SLhYhA3M5WA/bmQh+pcE/xZqrLQvPkVo4x42edaXliQsqm21a1idVhVH 3e1gf4xXZk5AliSLh08ocqa9ZH1bPC0dm09VTC2efFWtr+vqp/O/A0ZfZBSpCqs/wRrIu9 s+erntlfRRfxfiYgrH3YyfXjlQLSDdv99YkO58eQ3RfC42pk6JvWpPESC0UuYfY5cLOFOJ prh7rIxoMtqif20ce+/AY3iWEE6tvBcvupIhUHp2FwQ5aaeaSHL3hZNTrLPinw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705956158; a=rsa-sha256; cv=none; b=HMoEnBSZtek0jAY7csZSfCW2hjKEtELxebu2CUNeUYAb3uR5gECaK8jLp3KDS376lsUt22 Y7TPauVBFzjUvMGhjlViPWv5suk5b87O18k0wA3QaypgMQWoJkVfAEnWG//UUNHpY6Pgr0 bRNDRhF++xLENFBpfEISU5OW01AAXWJavVLw85BuI+Nhko5iXYWsMNknmxMFHBovXhXaO4 cR03JucWDYRkqg0nHZ0tJow1zdeCvFC/u/gGurVyzJ9UMqu6Kpm4yTCVv5DMqmHqoyeqYc rsNdde5+J4JWHszmLe9+m5abJ10DAEc2ZL80iVkx4X9NTxhcFJN2286VBnpePw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJhx96r1cz1G7s; Mon, 22 Jan 2024 20:42: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 40MKgbB5045941; Mon, 22 Jan 2024 20:42:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MKgbd1045936; Mon, 22 Jan 2024 20:42:37 GMT (envelope-from git) Date: Mon, 22 Jan 2024 20:42:37 GMT Message-Id: <202401222042.40MKgbd1045936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 7f3184ba7974 - main - tcp: remove outdated comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f3184ba797452703904d33377dada5f0f8eae96 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=7f3184ba797452703904d33377dada5f0f8eae96 commit 7f3184ba797452703904d33377dada5f0f8eae96 Author: Gleb Smirnoff AuthorDate: 2024-01-22 20:42:21 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-22 20:42:21 +0000 tcp: remove outdated comment This paragraph should have been removed in 446ccdd08e2a. --- sys/netinet/tcp_var.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 5f064ead7f64..f9b3d1a5c3ee 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -535,16 +535,6 @@ typedef enum { #define TCP_FUNC_OUTPUT_CANDROP 0x02 /* tfb_tcp_output may ask tcp_drop */ /** - * If defining the optional tcp_timers, in the - * tfb_tcp_timer_stop call you must use the - * callout_async_drain() function with the - * tcp_timer_discard callback. You should check - * the return of callout_async_drain() and if 0 - * increment tt_draincnt. Since the timer sub-system - * does not know your callbacks you must provide a - * stop_all function that loops through and calls - * tcp_timer_stop() with each of your defined timers. - * * Adding a tfb_tcp_handoff_ok function allows the socket * option to change stacks to query you even if the * connection is in a later stage. You return 0 to From nobody Mon Jan 22 21:03:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjPp02B2z58Cyv; Mon, 22 Jan 2024 21:03: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 4TJjPn6SvBz4HNN; Mon, 22 Jan 2024 21:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=311XxfIfo4VUW7rcKVHyZEIrj7U7VbphmMan2XuFdzk=; b=XbH1no1fMRZ8RYMqyVpQi5fm1sslzJ6kCSCEDF/vmE8obVSfMf3Fk9nLRxlInz5hAEoU/E Cr1r5BK4mb4uGuok0t1oOibo9pOciLpiME0BYtiu7mmCBnbKipMbfuecyb2t7o7mGnq8Uk j13fDyNVhoiZS4gcSQAVkjoD/adAmj5bFtukjNwXhOSOrF0fi1MLvTgm+vFUx9guzrCDcn 5kTglGJ71JqpT7ENXKagHLZ4mYiZdDyXPvMaFykWNHax+yzlzs+6p2E1LL9nCtYEDIqNuP //TcSg+k7k1/iuXCfGJRMqjmWnYHbIvfjQ/iiWRQqS/RImCswKbfZJbrnw0Fvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=311XxfIfo4VUW7rcKVHyZEIrj7U7VbphmMan2XuFdzk=; b=RkPpSJyGgbkz3PMcC31l63x0GhL/Xa/r+sdRSoBZs+A4/1H7Vp6VtkeyGxx4Hy5drUaAvK Dt5Jwp8ulJJwUAtlceB49acSw1Y9guSz6sYGdN3yOt5OvzLwBJUoZV0GypApaKGI4FT0xl 7hGPxawnTxs70bEzjaC89w6nfXHj/IQ/99e0mxtcuHwuesEHqj/sLByRmIMuekw6sedFkD 7HVOyVdxEK4+QoqvWl9719l4l5HK115YZWUsWYa+PZ8Wnmh5tzi6xFAII4YhgJCp9gRayD 6XEHk2j1pKEVUaFQt8IuSck+uEGYwGE6lF7JhdX6VcueDrz70SsX+3TaSCyZfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957437; a=rsa-sha256; cv=none; b=XTyOs1xawpGG+i08ZW4NAA5rsu24O9RNWXyTuRHTh4LRKh5SpJr7ZSef6jn3ODibvcNpFQ vkk7fSFwt1KxUVk6zYSSPWvcPr5lFGaoLqN9RVDN4ysEx3nRH6d6dWXXqXcu20HToraf15 XlDhAnMIXKlnk6OK9dFFCWQTadn3P6utfLsaxWrveoTJTcQq67e+p5aRy0XwTAVjiFMSFb 0r2Tdr7sUioiwZUdSSiR57MBsfDMzH1v99otT53PiXjChup1KmD8VsowkRB/zJDTrjrgdI Z2aWZhypahV+5BGKLkEA2Rx5t8jYYfO3S1ftWVs+Jojlg0l2AMfHi6m5regoTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPn5WT2z1H3G; Mon, 22 Jan 2024 21:03: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 40ML3vp0080551; Mon, 22 Jan 2024 21:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML3vT1080548; Mon, 22 Jan 2024 21:03:57 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:03:57 GMT Message-Id: <202401222103.40ML3vT1080548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d04df664776b - main - bootpd(8): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d04df664776b436f712051520d48f84be93ab269 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d04df664776b436f712051520d48f84be93ab269 commit d04df664776b436f712051520d48f84be93ab269 Author: Gordon Bergling AuthorDate: 2024-01-22 20:46:31 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:46:31 +0000 bootpd(8): Fix a typo in a source code comment - s/adddress/address/ MFC after: 3 days --- libexec/bootpd/dumptab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c index 3961cb4210cb..9b839c26c5b9 100644 --- a/libexec/bootpd/dumptab.c +++ b/libexec/bootpd/dumptab.c @@ -323,7 +323,7 @@ dump_generic(FILE *fp, struct shared_bindata *generic) * * The addresses are printed in standard ASCII "dot" notation and separated * from one another by a single space. A single leading space is also - * printed before the first adddress. + * printed before the first address. * * Null lists produce no output (and no error). */ From nobody Mon Jan 22 21:03:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjPq2DYvz58CWZ; Mon, 22 Jan 2024 21:03: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 4TJjPq0Kz1z4H7y; Mon, 22 Jan 2024 21:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pizj18MMp3ueKgcmS6KDov3UlD7RyDFBIL76K2ce3g=; b=Lg12d7T+ykGRjME4yRoPPTcEOAQZKX3FGskvpFwzMCZX2q69xTVZjaWNkFjeMrXVGfWNa+ O7TG1RmmoELG/9Igko6p6uDzj7/20hA42DsGix6h2xr35eJMWLT1krJ+OLbvFx5aUdbh8u 98zRfNVqDrgL1AqyBH8L0dxEDV8aUWDxxTj5puMx592/wCob58AqcaxKUVKW0kYJXHnGmC g+plGeRBvqr9Q45nGR1dauektkvoIRBYYYvel8z+hLhq9yimw+cCveqsjxfPQlK+XuP8Jb 2hnw6PRg0kUaQA3Yc+bjEVjgCC12obGdtMy4N4+ASrpchfw695Lq+U7xxbSgHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pizj18MMp3ueKgcmS6KDov3UlD7RyDFBIL76K2ce3g=; b=CrMXDLoArZcBEhVFe7qOVha+84R2ThW9g1ROyut3MJp8Nu2aTpS1t1ZlD6j5wpvt5MpsRW KhFm+jdF/GksJ5PY9eLEXgB6Lj0Wc5SeJ4Jx6fvcKSV9HEV8H/OAzBgqiztZ/Ui2yPq5+r R5nHfp62ndohy2QylypWdvJmMnFJl31z2ZVnPnJ//Zq6d8gFeULq06dmnfe3vTdXDkCx45 Qp5EYlITAruGeRLDgtEdWBAZjLpjmmz76NqagN+uX7fWAYTBhRro1wvUbOJnO/8b16cgp3 x6paoytx6uJy5OpB9o4RPk/wBlDGj3sy+m9mm5GhFzTFDgV9375rgiipUiuGsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957439; a=rsa-sha256; cv=none; b=Dgj/+1hD4jVyCDPFZ/01mFRimx1RYV062Ps/XHLBBOulnL6X1mjIgavEoKOvn1qM7WhjvO UKUXiWnDMsAukcq8Nsj3NaQFdS3YdyjaKZSUnHdjaucf3to++p2QMbziAzznZ8o58ohCwr TPRVBuaesKwQpjF+Fj4aeK0JIelbBi0yCekN7QWVfyJXmruuYRgYCNjqeHQSdEfGT/kqLm nSMhPV7y58v/PUA4QLhzPCB3UBh1it902OfAhBh8VvaS4nl6nHbEaN4d84DPAO7k2YWmC5 2dSPdFzd5WSvX6X61GC/AeMD58LQrKMPzyKSXE3O13CrdhecTvcbxDdCgZCrXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPp6YV9z1H3H; Mon, 22 Jan 2024 21:03: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 40ML3w5X080602; Mon, 22 Jan 2024 21:03:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML3wrn080599; Mon, 22 Jan 2024 21:03:58 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:03:58 GMT Message-Id: <202401222103.40ML3wrn080599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: b971c51a4d94 - main - aic7xxx: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: b971c51a4d9498c26079fd8229f7af6ef1585020 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b971c51a4d9498c26079fd8229f7af6ef1585020 commit b971c51a4d9498c26079fd8229f7af6ef1585020 Author: Gordon Bergling AuthorDate: 2024-01-22 20:47:23 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:47:23 +0000 aic7xxx: Fix two typos in source code comments - s/recevied/received/ MFC after: 3 days --- sys/dev/aic7xxx/aic79xx.seq | 2 +- sys/dev/aic7xxx/aic7xxx.seq | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq index 118c4f187486..85957102eb5e 100644 --- a/sys/dev/aic7xxx/aic79xx.seq +++ b/sys/dev/aic7xxx/aic79xx.seq @@ -1198,7 +1198,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq index 1ae250d880bf..a94e2dae4149 100644 --- a/sys/dev/aic7xxx/aic7xxx.seq +++ b/sys/dev/aic7xxx/aic7xxx.seq @@ -1639,7 +1639,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; From nobody Mon Jan 22 21:03:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjPr47r2z58Cx9; Mon, 22 Jan 2024 21:04: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 4TJjPr1LXnz4HL4; Mon, 22 Jan 2024 21:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8FTdOMW79/Deoi8FplPr1Y7JXP+XyGZ2ktY+5wrG84=; b=AKGhFKzIS3GlBtK4MqZFGYrH6nW29emAOCVl1xT1W8+kbKS7I95pU2t63lPYeMKKfjvFNk ykzzpg90vFg4a7MLLhHNioOCJesp/Zi+zKRM6ZZ8UVcgAP4NdACU+O6wG32KEZae7i9u0L P3cRPx4Oew39f7w2+GJutR9nonFwZgbfnsMpEZDJVBgHpxIhcK1ZRsEp/Sgd85dtIhM2P6 gvxG1sL1mGPjY2T4dlkHkwJtVvWatZrpL90FNJWFFdsefaL17rC5VFvPNqVu4F87lSD+tZ JTBMJrat6k9qM9XUNTZyuBr35b4BETMdTJ1DK6WybfRB3yvBVnWCwBQ9wQ7cXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8FTdOMW79/Deoi8FplPr1Y7JXP+XyGZ2ktY+5wrG84=; b=c1Ge8twBLTDu8oSgzpkdLDJqeLbRcC3hu6XkhZ9LKw6jPL19BCD1ZQwCY7fV+XDUF8oVvn lynbGl6vwM8HR2W7iRDkG6LOtvcxCQKMMWHQi2VpXKt10lTW+xkGtNYk73YaX8Uu+KuM9p VD26cE0lPPkSyjACMidbJGL8Y6kv+s2AURAoz9+LFPG6EegmTeXMAVsGfIE4TOg4Y0xDpr NitxKilbdchwA6nU6tUe2JrBizIeyWkG8UQQAdJPU2q3SSzXNCiWjR5WPwYmot9ljelvZL C5mnn045HnkWybXfCApwg8AAKttZWXujpYWeMMBSGlK3q0TNgER57pwJTGdsVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957440; a=rsa-sha256; cv=none; b=xnzQl52vtbPY4hepSKPQEj8CJO5GEQOHxHRlH9x7VOb7mh2EouT6LIK1ueOdl//QZYHhYM C04mYptJ6wOg4YzEKzHS3DCNffRiVROzrHST0WxSgzncfAHST1KDsBw73BM6DDarZH8Dxq mkdQVWqTPI1gx06YBYtj59M3jdjmTtDnzHljxYPY0I+QPwIi9tveSlPFCLKVLWOQqGmyih +gHQmTFQPVTxQtSjlgzIVhy10RW9Sl8thvahJUfEViCNREmF08I/MekO63uTN1UbgmZKqG Vi8vCkUBkJ9lEDUOAEGuXgUkyU77mTLlBgu4T9aKGX2K84IEXuA74zEPBU1AnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPr0RwRz1H3J; Mon, 22 Jan 2024 21:04: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 40ML3xS9080654; Mon, 22 Jan 2024 21:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML3xIm080651; Mon, 22 Jan 2024 21:03:59 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:03:59 GMT Message-Id: <202401222103.40ML3xIm080651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 496432f19216 - main - netinet6: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 496432f192165b8700da4b0ab8ebdd253002e265 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=496432f192165b8700da4b0ab8ebdd253002e265 commit 496432f192165b8700da4b0ab8ebdd253002e265 Author: Gordon Bergling AuthorDate: 2024-01-22 20:48:34 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:48:34 +0000 netinet6: Fix two typos in source code comments - s/adddress/address/ MFC after: 3 days --- sys/netinet6/nd6_nbr.c | 2 +- sys/netinet6/scope6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 7d89fcc4ee69..7b4fa7a8d8c9 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -262,7 +262,7 @@ nd6_ns_input(struct mbuf *m, int off, int icmp6len) } if (ifa == NULL) { /* - * We've got an NS packet, and we don't have that adddress + * We've got an NS packet, and we don't have that address * assigned for us. We MUST silently ignore it. * See RFC2461 7.2.3. */ diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index f3cfd4602548..0987ea7e99ad 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -525,7 +525,7 @@ in6_getscopezone(const struct ifnet *ifp, int scope) } /* - * Extracts scope from adddress @dst, stores cleared address + * Extracts scope from address @dst, stores cleared address * inside @dst and zone inside @scopeid */ void From nobody Mon Jan 22 21:04:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjPs37Kfz58Ccr; Mon, 22 Jan 2024 21:04: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 4TJjPs27vjz4H25; Mon, 22 Jan 2024 21:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXVJVOnSEDxlc1Fslaxaoub/MK/S1lYBBSlY51HBeZo=; b=k8mFezGzGkkteTnQT1lAnKWBqtZAYN/t3e96TzKtoCyjY0Bdg0rrwrAN+up7yep5qZ5/Q6 tjJeaPw6hPiVpwRmYVCqF/joKAaDBPX5WZs3niDDUWenSvsi6XTI6JPqTslm5945VU1xNL pItox+emYTbec6gtPP1j8l0FTjJmYxpQtfstPYZbIX4uxJl+V9+wGQOPY1OE0u1EkeDffE FnzmaA97l3VpNur1ZsuPGyA2LkKkLfTnlMdHUTzzTx0ONt5XTK/9J3UU8xxxWPn/NtUw9u LoWkb4NR40qaMRU9pGgbDSRGBUwNNJLNYYSLUeyc4mt68VrGC+QiL7BgQ/AxLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXVJVOnSEDxlc1Fslaxaoub/MK/S1lYBBSlY51HBeZo=; b=iYx7ju+JIJaRrpHRI3IXvk8lrD6nGmvz+mxiQg1Bo3lAYoxQsI6GM7XqI6Ici4kN1UcOfz /oYpHy9sPDFEHXMgHT6cmk57w+jmilR1mZkChwgZegNY0t7S7cdBwTGKrczrt+G0ipveBc C2VmEKzavfyyfCQKq+bysNabXwX12jtzWTX0AZ49xxBUeX97+GOBsh2hyEjsy0bDpiyclo z/DzfcC+Qqd6Q7tYw0vsIF+0dmYu2efW7rcxk13nYdTQrekR93lISbkQG5fATZtmiOg6UQ u/DBTeBm860IPXMpjIGditf+52djlmdycjtc+xv2QURuVG1viP5UUUg8Qa6oFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957441; a=rsa-sha256; cv=none; b=jl601SFu3DBhnAni3ppsH7NnWHllydL0a4q17z7C7thA/j7wHgzqr/2FXqi4tiAFvLDZhq VeyiHnVPTyEy/8Ax5HIgc+pKZdKiUsCeDFS64K+LX1dnVryyCQcSTpR2j+qfXlKoHQY4gV xeZhqA7i/ue58Mg1m4inn/vKeWnbXditDFXBikhLdKLWGXQaNxuvwZfojf3ZkpaRuQgQW/ iT7sWZrOJRILH9hYErQujLQLLERB8Pw3/nTj+0mMohfHqTwpl8qXMN5NMk0odyGqY4W9cZ t81zXmeg/Uk7L8zqoQgTvTdXBZTO0yMkHumbxSZHKZyc/GHFe6i7+4hpI4s/DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPs1CNDz1H3K; Mon, 22 Jan 2024 21:04: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 40ML41N4080719; Mon, 22 Jan 2024 21:04:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML41PM080716; Mon, 22 Jan 2024 21:04:01 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:01 GMT Message-Id: <202401222104.40ML41PM080716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 9b035689f15f - main - tcp_fastopen: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 9b035689f15fc4aec96f9c18c6c86bd615faed2f Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9b035689f15fc4aec96f9c18c6c86bd615faed2f commit 9b035689f15fc4aec96f9c18c6c86bd615faed2f Author: Gordon Bergling AuthorDate: 2024-01-22 20:49:47 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:49:47 +0000 tcp_fastopen: Fix a typo in a source code comment - s/posession/possession/ MFC after: 3 days --- sys/netinet/tcp_fastopen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index c31225214d1d..609637b83df3 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -43,7 +43,7 @@ * * In addition to the facilities defined in RFC7413, this implementation * supports a pre-shared key (PSK) mode of operation in which the TFO server - * requires the client to be in posession of a shared secret in order for + * requires the client to be in possession of a shared secret in order for * the client to be able to successfully open TFO connections with the * server. This is useful, for example, in environments where TFO servers * are exposed to both internal and external clients and only wish to allow From nobody Mon Jan 22 21:04:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjPt5MSpz58Ccv; Mon, 22 Jan 2024 21:04: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 4TJjPt2jcqz4HNk; Mon, 22 Jan 2024 21:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bz70VjSD+qVr+vNib56pAVWQ8uybmY8U9dN01W4kIck=; b=AaX2YMIlx0XRPmEQw1T2+UUlZ2o5Ao9JbVbapgl3yZ4lXjfFkgqxaOrX0O4jVEC32bbvff t0wP6AfDNQ8lwttT+OJ1XDh9bUo/sXCrsbI0IwAxMWuvWtWjBDWC+fptkuax0QEZtCTMPl qdoNhbKJQ2sLJhh0H2srIy5XDogABDW02qP2/tC4vVC+5EQVKBfe/HKz1z28mjfodxuaEZ Wh3NaNeBHLVExiBrKIu3wt4jciIIzabAEjU+57AWcXXOM7s9lT7T2C4xRpNxF1gLTd+WJ0 x+XMOnPpQrGdGAh9Jt3wjK0LzoBJ/oBEHAX2Ld/vedxCKCPloFGQKXWcIiPlYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bz70VjSD+qVr+vNib56pAVWQ8uybmY8U9dN01W4kIck=; b=P2XR37UZtoLrZVOvDBatsxwottDvAJLJhKsvY2g2MJG1OUdvnjAOOYfC1dynprypxb9YLG GOFUSiby/AM2Ku4ItFZlcnWAUKlsWaeLF7FkMHNs/87FPpaTYjnUaiRf4ByYNXHn2HRzVx 5sih0xERBSabCZ2+HVcW/4DalWItdkKobYhk8L9ZNKRUbWI+AFNDTQ3x9lCp8Xa1itUD6I dX2xMAiX6AdhSexXru1OnH6WkDZ+wggdBowNd10lokk7ytOUN1AkJoQbk/Br5GIS8EanIK tgbvLp8ECmyBilRgLxxSD75FPLv7BzH7EusREtLCtV0E1PnHSUU/E5s8zwZYIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957442; a=rsa-sha256; cv=none; b=vIGSkJv3+5qFj/zUpLoRzjcQQiDQjmUaUrDRN6ZIrab9uPKrB7rSasFMfVEAmMbhfNMJZ2 AcIL8WT/nqgc9KnHJwIkwcdUUVb2v6fF6jUVramFE8RAmZyzvZrYqAuIb1yNdUroO6Te3R U7QPZxlghPOVfZN4/pPPbft4ynppVtdfjVRXeITy/zcqqClMQE0no2KdfQ+kwVVEa/yvU2 kUPejLoppqRXzl3qu8nBD3gBy+IJbRkDtM0RBVAtJOZmWXmZeP2nsHmEA+PRVu6Ja8fmg3 pgKyaeUYfLDt83Ls1BlCfxUmCBds6okzDmdU1TjvBJB+edwShW7H3gsRkfsO6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPt1n1Qz1H5B; Mon, 22 Jan 2024 21:04: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 40ML42OI080773; Mon, 22 Jan 2024 21:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML42lM080770; Mon, 22 Jan 2024 21:04:02 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:02 GMT Message-Id: <202401222104.40ML42lM080770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: cde9ec6a451d - main - netpfil: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: cde9ec6a451d22ad65fbe602dc57135177c0a865 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cde9ec6a451d22ad65fbe602dc57135177c0a865 commit cde9ec6a451d22ad65fbe602dc57135177c0a865 Author: Gordon Bergling AuthorDate: 2024-01-22 20:50:57 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:50:57 +0000 netpfil: Fix a typo in a source code comment - s/strucutre/structure/ MFC after: 3 days --- sys/netpfil/ipfilter/netinet/ip_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_pool.c b/sys/netpfil/ipfilter/netinet/ip_pool.c index 20a3eed5eb4b..2ded49401658 100644 --- a/sys/netpfil/ipfilter/netinet/ip_pool.c +++ b/sys/netpfil/ipfilter/netinet/ip_pool.c @@ -1094,7 +1094,7 @@ ipf_pool_flush(ipf_main_softc_t *softc, void *arg, iplookupflush_t *fp) /* ipo(I) - pointer to pool structure */ /* Locks: WRITE(ipf_poolrw) or WRITE(ipf_global) */ /* */ -/* Deletes the pool strucutre passed in from the list of pools and deletes */ +/* Deletes the pool structure passed in from the list of pools and deletes */ /* all of the address information stored in it, including any tree data */ /* structures also allocated. */ /* */ From nobody Mon Jan 22 21:04:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjPv5gjqz58D25; Mon, 22 Jan 2024 21:04: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 4TJjPv47CMz4HP4; Mon, 22 Jan 2024 21:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tbjr8pN3bNeATQ+7patvXhICfa9x90s0gg1A9uCbHek=; b=KteKlVNnZVU1JA9MIni9I9iCNKn5cndMC/HYgzlHawu8FBO5pzRWcMumiv9KCMBJBk99as mGpP8zPy8T4uyDjowwT2GRuwTj/7UIb0CMc4NMP0kPQI6XhaVGI/gWGluxs0d+d93Y68v5 RovIS6eX6DbcDVcaognN7wK3vu3EJ0ykvBPVJLRt/5hXeUdqSgQZk1Ca3IRj2IpyTTk4T9 2BYS4xMHZJ3yUD8IrBqpFjKJoDdGJdlT40jxVlllqcDXhgFQraPVIuB5RarlIKuSaN7GE5 1RE0N+ziLGmLh82KHzdJL63FIt4mb0mnSOtu9NqiV9rEPYFtd4KVMSFVBED8OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tbjr8pN3bNeATQ+7patvXhICfa9x90s0gg1A9uCbHek=; b=PWY1bZKY/CHOQQ3qvR8PS0E7+GxAuVwatv31l0Exl6s9yL6LplaU0o5ty2kLXzdeUJKkWq roJ1pUQEgWR6ftalRVdGHxr9gtz6YqRuI+D9v4pDw++EuVjeR3yL/YJsGaL5unqgR3yA7M h7srbEek0xjp8N9mXavS391ZUqew5Hs5gMnjC76zN0J439o6tQF7UiVNPgdxGt69SqIc5Q 8C9muHfl9al1YRjqXFSfgm53d1dTzn+iAERj4i44nJoYkKFxsovpwsUY96qnxhlE90UDPU Nry+rfMH4j0THmlHtogBhTr8L1DBrHUmFqJi1xMbFjW0uYRF6RQpcy7Fd/YbAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957443; a=rsa-sha256; cv=none; b=AHO6CLFO85xXWbNKjh8eSJiFRXfmatwSLKsbqAFMiUZ3E/iAmeN4WxsJuna8Gyv8L1nOUv 6aa2E/Z67/ongWZfVeKGLcDH21UFodgC+2nOYgRYfCwcOlcFoPS+6M1/Tchg2/eC/eWh2n MNtZbm8fPTCF0SwgHgT6zyNxQSlmVFJzBCPG2O+LIobOQfdb+9wiguTlFs1cToQhNwpGxw uI5AlTFRkI6bikCTFf+uQtN8ax2KEfhB1Tt9r9ULjXx5Qh4Pcw60nvlMs07VXt/QyY/CCd g0eGI/U6/D4AUrxHjLrcHVC/hAkIXgmV8hr8SWkQCGOjChkcXdwXZC7rXhwIkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPv33frz1Gxc; Mon, 22 Jan 2024 21:04: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 40ML43l2080834; Mon, 22 Jan 2024 21:04:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML43ew080831; Mon, 22 Jan 2024 21:04:03 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:03 GMT Message-Id: <202401222104.40ML43ew080831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: c90f1ed10460 - main - netlink(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: c90f1ed104606f5a691ea2defc5711ca9d28fcc7 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c90f1ed104606f5a691ea2defc5711ca9d28fcc7 commit c90f1ed104606f5a691ea2defc5711ca9d28fcc7 Author: Gordon Bergling AuthorDate: 2024-01-22 20:52:16 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:52:16 +0000 netlink(4): Fix a typo in a source code comment - s/permament/permanent/ MFC after: 3 days --- sys/netlink/route/neigh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/route/neigh.h b/sys/netlink/route/neigh.h index eacacc09711a..10bc3b93d16a 100644 --- a/sys/netlink/route/neigh.h +++ b/sys/netlink/route/neigh.h @@ -82,7 +82,7 @@ enum { #define NTF_PROXY 0x0008 /* proxy entry */ #define NTF_EXT_LEARNED 0x0010 /* not used */ #define NTF_OFFLOADED 0x0020 /* not used */ -#define NTF_STICKY 0x0040 /* permament entry */ +#define NTF_STICKY 0x0040 /* permanent entry */ #define NTF_ROUTER 0x0080 /* dst indicated itself as a router */ /* start of NDA_FLAGS_EXT */ #define NTF_EXT_MANAGED 0x0100 /* not used */ From nobody Mon Jan 22 21:04:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjPx0MJ5z58CxF; Mon, 22 Jan 2024 21:04: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 4TJjPw51HWz4HK3; Mon, 22 Jan 2024 21:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wXPrw7X6Av0ImbHuKnknYJLsG2ePluxgPNVIf4m6bk=; b=KiAukm3K40KbAkIilO85oayVH3GDMyiyeSu1R3RuVNwvayr2/NjRa3nh01MLlZi4ppEjcO gSWnY1H5bL0hNn8mNWyEcpv1ebdMNjyBMIMkcFNIJEGsW9KuQ3N5Jhkz/ClwmUHrUKLMrN ivnIeNZ6hbxgM5/jsFMMctyCUhFkmp6gPUGzbtUtajbQVR9ZVmzezOzwXIMrQStLobvYh1 NWv8lNKgrzs2SLfQiBAytv8jpbF4L16G3qXxwknPzfWRgsnTLRVUGn9pyYNFf48E/RtQp0 zEA0OLoZQnBRkA7PelK72oKkckCl+M4wNwaUwko0GbhmULicLyLk1SYCz0wigg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wXPrw7X6Av0ImbHuKnknYJLsG2ePluxgPNVIf4m6bk=; b=LsYjDezkw98JhColk1nsMWk5ahy5gr7JVb8ZHMMDLfHDeK/lR7/APhxxCS8VT7Bx6elHAF ghAsoFk7Bbpl69rhy5yt2xgidLJVPn9UK0FjyDWKDeQRYLc6c26Qu/lrZ4k9T8wNSxbH9C FhEfhqwxhhvFG0Ob2DSlpnxCrZO/6bSw6o4S99+tXbHCsOS7gONBzyHponbRSotwMeUnMt Mdfk05BnZ1FzEoTv7Tndax9Zlle7KvFeWVP/hANSZgsLdc8zaLEjOCOxdbx7qYHLgc2DPe H24X1yLqAiPRPNHGZSE1WJ1LcCHXPfhed8Ow3Cw9zJJcapKSUQR8mYdPutRvBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957444; a=rsa-sha256; cv=none; b=GmYVB84073OPkfSZequ/ft+ZkKk3DXOyeq0xAoq/7k7KUn5uU07rfsIA42Vdz3eqx9DGz+ TKcfzgxBGszvDj6B1HAmRKdAlsL9csnPeUbkymFtx0H6zUTejzWoH7f5+M1b+l5jh05FMS 6sHkCKycVJKjWodDsKkTVhML20G/hXByjoF6YzNpZZTgeS0tUYUuN4NTkgmFfBjy4AHr9k F+w/hjIF9rKmpnwBFhbtEeJFWPMu5jN0dRIrRpoBBFPoaLZtwYPa9Asd4IxeKEn8iDZiy+ yM67kXdoj2Mn6ymBwstviKO0kF5RoHdViwSLlEd92paGvdbh4+hEnw6ePm1YQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPw46bwz1HFq; Mon, 22 Jan 2024 21:04: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 40ML44WZ080888; Mon, 22 Jan 2024 21:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML44Oo080885; Mon, 22 Jan 2024 21:04:04 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:04 GMT Message-Id: <202401222104.40ML44Oo080885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: ab6d773dbf92 - main - rtsock: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ab6d773dbf926e4f92e37b67a85c3290cfb90723 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ab6d773dbf926e4f92e37b67a85c3290cfb90723 commit ab6d773dbf926e4f92e37b67a85c3290cfb90723 Author: Gordon Bergling AuthorDate: 2024-01-22 20:53:21 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:53:21 +0000 rtsock: Fix a typo in a source code comment - s/adddress/address/ MFC after: 3 days --- sys/net/rtsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index cb149f176b6d..e4183232700e 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -695,7 +695,7 @@ fill_addrinfo(struct rt_msghdr *rtm, int len, struct linear_buffer *lb, u_int fi /* * A host route through the loopback interface is - * installed for each interface adddress. In pre 8.0 + * installed for each interface address. In pre 8.0 * releases the interface address of a PPP link type * is not reachable locally. This behavior is fixed as * part of the new L2/L3 redesign and rewrite work. The From nobody Mon Jan 22 21:04:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjPy1Xsnz58CgF; Mon, 22 Jan 2024 21:04: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 4TJjPx6C2gz4HXF; Mon, 22 Jan 2024 21:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBqJO0WG7R0obouDL7cIdTtiQ1igSCvD8ysszefG9W0=; b=MvOkmIn1QIgQ2BxydBZXjyZv3BLyNZxq1H9mS0Ts6M/McymQAqAZVs7EjrO92vERnj7HX2 f2U5Ye6BfbQ2DmLdA+OdYQu3fGMfvuW27xOvcZ4PVy/E6WfGh9VQD34b5V8/sHuo+0T9hJ mjcCoYIwwpcy9kHoipDPGgwpCzwvnhqcsozBayfuUPrMXagTYNG/pAilWp0vrgQ+DvyORg b6CIkIv8lljJci5VCTbazNYM3ewn7IMvRD1UHwAosrf1LcLco5yQNCRVRh350RGIFGJgGY N+gCaYcSZ5dvh45R+vE5UbgW4zWhHFe1Z2D3mGIENK7WdFyscKrops54L/Mwqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBqJO0WG7R0obouDL7cIdTtiQ1igSCvD8ysszefG9W0=; b=WcJZXTYBvQj4ysTEUJWMiueQvm4AZSAyuN6mnFhnBupaIk9BuK0ngbKIG34fqeYjUW5KHY Hiq0TqvFMj9Mvjs1r/pfBsRRkNlgEYRUpuvhdoW+wmeElJcEHKq4UAPTw4FtZ4g9HC4DRr cTqIEODcEZT7quOQXDa7FY3Gn+xOCIe0K/tFh4yRMCrIq52sFlQEan99xDK2VTYFMep78D vCZp0be4zesTMNKWZaFvX2aE6Qf9wcZlbP3TKMPiL8syK6G610R5IDglCY1Buo66SlIDX+ HtTZPdvw20EFk9E2IUVnEvxxA0dCrPB9NKZcPLYWFZJw/iwjRtDvOldlFTdIyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957445; a=rsa-sha256; cv=none; b=xVSWUiftggPOm87r1zbqe30ATgp3QJXeE4xiGCt47UXWOADwycfl92eLJOmKC28VdZBRCY dxCXmOXy9vWMUedUj6xCQXT+4jIX30Aw6oEO3ghgFwUWKMUb2rnwngAwLwr4YuhxOycAXs zLSILS1wLtXrPxINywl/TLILH1RwuUOBRXWUcGiHd4GdKE5oMH4L2URAwXv53oj2Lp24ge 6oGpi9FViGa9QV8GrPh2zO0mX6c/de1iSNnmHisty2F3ksXrtg48dXAeVCmZ/a55WTiy67 YfUrUbuf0sh+oW4IZc6g3EVHD6gmIVTaBvPQ++/7UTWYhQ1DrQn6DfV5IXs/7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPx59Ygz1Gll; Mon, 22 Jan 2024 21:04: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 40ML45uh080944; Mon, 22 Jan 2024 21:04:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML45ee080941; Mon, 22 Jan 2024 21:04:05 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:05 GMT Message-Id: <202401222104.40ML45ee080941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: c1ada3978310 - main - net80211: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: c1ada39783109c496fde853cc2fe32f31a8f7516 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c1ada39783109c496fde853cc2fe32f31a8f7516 commit c1ada39783109c496fde853cc2fe32f31a8f7516 Author: Gordon Bergling AuthorDate: 2024-01-22 20:54:36 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:54:36 +0000 net80211: Fix a typo in a source code comment - s/recevied/received/ MFC after: 3 days --- sys/net80211/ieee80211_hwmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_hwmp.c b/sys/net80211/ieee80211_hwmp.c index 429cd69629fc..c47e845bb8a8 100644 --- a/sys/net80211/ieee80211_hwmp.c +++ b/sys/net80211/ieee80211_hwmp.c @@ -1395,7 +1395,7 @@ hwmp_recv_prep(struct ieee80211vap *vap, struct ieee80211_node *ni, /* * Check if we received a PREP w/ AE and store target external address. - * We may store target external address if recevied PREP w/ AE + * We may store target external address if received PREP w/ AE * and we are not final destination */ if (prep->prep_flags & IEEE80211_MESHPREP_FLAGS_AE) { From nobody Mon Jan 22 21:04:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjPz3wKRz58Cpm; Mon, 22 Jan 2024 21:04: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 4TJjPy6grGz4HZk; Mon, 22 Jan 2024 21:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LGlgcsd/o0Vf7EIYCxS+5k9NRnnpvGGxMllu5nuW9Zg=; b=kD06EQOofiypepW9YV1hTouteL95rqHdG2FOZZVffFTG/M9rJK4eXNuqtAG3BEkRCF+bhJ IMQdnBan+UsNtYnu1CpQ5u7qzVkj8rmNI/4V67Y8oqZUxVZ2DZcZOD986lzouY0RBKZhwn oqdOncbAm6Tj4547WkUWKaKf0gb37vkE0C6+Aav42UcR3AdMUNqq4C7gUT5TU4YtymFdYa il2VfI7GYmT0f/8QZzS0DHQvF+wFuMgwdjUaraxPqYvMkrHF9Tk1L0w4EF/JrIE7dsRfnm y+b+mmIDEbYh16+iYT1iSVtOnG2F3Fpi6bUZbzo8+26MTsqpmzuoO6GMFre9kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LGlgcsd/o0Vf7EIYCxS+5k9NRnnpvGGxMllu5nuW9Zg=; b=Sde1AMW1PN3iglHLcOruMnXsyaL2kplywWNiMSLYeVRTDwyqIMQEVIDUTq43H2asrNOxGW aGGo1BbWQ4Ue9IRmG2v6GUoiQLH/56ATMePuolmI+N8858ZXuaaUGVKhy+tWseZEnTCLEx BnFukCMDRcG5LXwQAKDbcis6JXxQEc6YsFK4iOLCYGOcK2+cFiQxFl8eDe4/vL5m1bBd0V A2AmkGqaWpX8uTgaF2zLUELET5PTYbwDeLC8b9Ie81xoOdasBQTFcRSHblIxH4R1f3MyrX WtO5LOJrVzE9xxG6h60ie4+eCVlDgdPjxdu5R349GpIHwvo2vmBSNJELOjrueg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957446; a=rsa-sha256; cv=none; b=dhAQvbFBsiYFMKaXtEgtwH6ZXktrd67IjgKLWuJUKio76xeGWm32DShcqXJYnPfq6APWWA WLgy1DUYBlJz61kkbvB7i/ZVwJ1FwIpbkPnRizSwdh76NcAsmSor+uxFUUNnOXtJcwPlPr JSph1xrmP96D9qV8JsatO79I0YrERJ8AdUeqSCIxikd8dETs0FpMLnt/OhwPEaVKJELI0e ioC8LN+q6LjLFHaAA/CkEENkrHI73V3eAlLHIVxuggwjONI18v7M3uKGY/4+Q1ZDVc4/bt lBpfAsKaFdszt90AHKbR6FRkLj6bipLOFZ8M7xOb50BxXhDDsVmMKuQ2ZfoJiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPy5nYyz1HKK; Mon, 22 Jan 2024 21:04: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 40ML465F080992; Mon, 22 Jan 2024 21:04:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML46lF080989; Mon, 22 Jan 2024 21:04:06 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:06 GMT Message-Id: <202401222104.40ML46lF080989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: b2c48aa4d192 - main - vmd(4): Fix typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: b2c48aa4d19268610191a0b7d7b76d01d28b0a13 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c48aa4d19268610191a0b7d7b76d01d28b0a13 commit b2c48aa4d19268610191a0b7d7b76d01d28b0a13 Author: Gordon Bergling AuthorDate: 2024-01-22 20:55:33 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:55:33 +0000 vmd(4): Fix typos in source code comments - s/harwdare/hardware/ MFC after: 3 days --- sys/dev/vmd/vmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index 42b48da05321..1563d707c6b4 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -436,7 +436,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ if (*rid == 0) return (NULL); return (bus_generic_alloc_resource(dev, child, type, rid, @@ -464,7 +464,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, pcib_child_name(child)); break; default: - /* VMD harwdare does not support I/O ports. */ + /* VMD hardware does not support I/O ports. */ return (NULL); } rman_set_rid(res, *rid); @@ -499,7 +499,7 @@ static int vmd_route_interrupt(device_t dev, device_t child, int pin) { - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ return (PCI_INVALID_IRQ); } From nobody Mon Jan 22 21:04:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjQ03NVPz58Cpn; Mon, 22 Jan 2024 21:04: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 4TJjQ00nySz4HXg; Mon, 22 Jan 2024 21:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vNfwXVvlM3yXEnZS3xuNR3zUD2WSGvAIoeulqyrhd4=; b=p1Gu9XfScLd6LGKxmxSeCxZ1mO+N9XARKZ+Z42AiU4822C6kesNhtqq+aBM9zDHIPt1HrG NiqFP/lIMc9F9+7XDAchPqXTktxtCqGMT5MUCUTIif+grcZ0VMAPBA1chEAx7jvWAMRXlQ epJncQ1eBM+bmmk6ZoRxcYBRgGLM9+MTD3H95P7NvEZ/q18MgUIRMvMPuBu3MjRwC1Gu8s YK0k08arHvm5NKTav4J7f08ybCpcnzAxjYtLXB2GjLrRfN0pqhjLWIbu/duyXr+OaCrSLv zIdrKbXL37xpOeEnR0OCqCPmdgGjY4d0jYrrR8Mcx/8GnrzQp+xnnm9xFUeutg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vNfwXVvlM3yXEnZS3xuNR3zUD2WSGvAIoeulqyrhd4=; b=EUOZemveZTUIujXAB3wiWa00Q/WVZMMjFQY6kn7Lu8G+yw5Ew+XbUVcB435JcZGVWANdYc GIcwe2ZsPthCU1S8q85IVrnKa23QBywNEfwy+zu2QXi4CcxhclH5fe7Vzmu0gSgP/rPE78 4SqB6IpV+q7VzgxB+0uJ0sdz1KYWl8t5XydcDv8h08C1IvHGpbCQrjee5vFQo17N9fzwG7 BLtaevJPXV2y6M5KKkbddOB8mZyRFDvcVlZ1JaNnFKOQ945bu8orXJick7IR2EJv4fO525 KYMuUmNTxjG/a8Fp0olJ60v8nGpV0boFWRcyQCe4Drb0h+OWXlbYJgznaQ2oig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957448; a=rsa-sha256; cv=none; b=OUWoTbh55zbMfAyVNpG8ML0z7TPi8fLcL06R4TPVmWoakIt0kWnLsZK2NTt2LVc0qU7k9T B0CVSpJJ1Mdr0G6ZFju6pETdG57OxBheJRU6Wp1M4Cp1XUqDcEUo80bZ0kfLPJNfoBkanc DvAIPBvFdAA3ornAe/e2wDX5ps3c6vW50iZ4Zxm8bZl0cl590iKtGdPKuLZs3tLc6QRIRm GCahmB5vYTXfKNtQpg/wVIF668FcVn5531oD0YKAMkWVR4vxFt5fxC54xOml/IpL8lOVxf ZLkgthro/oLyPzwGT+i8+JWtBIDSqEayx4226NPhlX3EkktdJPfM8Scs/3zvmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjPz6vKKz1Glm; Mon, 22 Jan 2024 21:04:07 +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 40ML470L081046; Mon, 22 Jan 2024 21:04:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML47KT081043; Mon, 22 Jan 2024 21:04:07 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:07 GMT Message-Id: <202401222104.40ML47KT081043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d74371101629 - main - usb: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d743711016298046ca77c5661bab41739396a180 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d743711016298046ca77c5661bab41739396a180 commit d743711016298046ca77c5661bab41739396a180 Author: Gordon Bergling AuthorDate: 2024-01-22 20:57:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:57:06 +0000 usb: Fix a typo in a source code comment - s/recevied/received/ MFC after: 3 days --- sys/dev/usb/serial/umcs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/serial/umcs.h b/sys/dev/usb/serial/umcs.h index c8c6135710cf..0d34c54a3707 100644 --- a/sys/dev/usb/serial/umcs.h +++ b/sys/dev/usb/serial/umcs.h @@ -169,7 +169,7 @@ #define MCS7840_DEV_SPx_LOOP_PIPES 0x01 /* Loop Bulk-Out FIFO to the * Bulk-In FIFO, default = 0 */ #define MCS7840_DEV_SPx_SKIP_ERR_DATA 0x02 /* Drop data bytes from UART, - * which were recevied with + * which were received with * errors, default = 0 */ #define MCS7840_DEV_SPx_RESET_OUT_FIFO 0x04 /* Reset Bulk-Out FIFO */ #define MCS7840_DEV_SPx_RESET_IN_FIFO 0x08 /* Reset Bulk-In FIFO */ From nobody Mon Jan 22 21:04:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjQ12bxDz58CWm; Mon, 22 Jan 2024 21:04: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 4TJjQ11rFwz4HjS; Mon, 22 Jan 2024 21:04:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vK7TsgB5ZfGIjEYJ99lLr499i+Zy5PvKxYwlUrOv108=; b=cu/HARTBoTUXJnFX2R1i02ieJS5VO/TCcyoEem4ToDIY3Ygc4niTXdgjCfAF83kJupc4wJ a1UdwQ1xMhwun/qY2fwQRUsV8MosQ1Rj5hAJdD89H9oSiy1pkeIxmWwPXc+wQxguM+oja/ 62nLxITKZGmRP477rThqdcxmyrJaH3Pb9iwjv5DgWAV3pJ5XtIUED7RvJxNrIeqKi6lRMo nL+DOzmL2QpxRjRw7IKXWeXuFOU/QY+fCVl/CfmRZPlAL85399natdYVYpj5UrmsQnQI/3 rppiNOQ1iVgcSFmeb+r0yNBQhaeMGSlB83JIoJL+1IsUIsbhE1dbB7jOitKb4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vK7TsgB5ZfGIjEYJ99lLr499i+Zy5PvKxYwlUrOv108=; b=nv0ViTnQN5Bq5jA3TXCxSw9pmnGErZ0NTWf2mAlMIfFAJttAB3uFIh/kBJlcc0JJ+rZpXM UIp/bpV8tM1IeXEoZi5JIIjNitemZpPOaxkIHWWnqTSjSMXv75dtjpwqa/BVD2IYrouwfV Wdj5/o8IbE821pkayHAiSds4wrW8Vmau1vGR9ZcxfF3UTTyy1DFgnj14LBqx2nyVlMtAZ7 Jw1XXu/X7WUisgZWNwTiR65BgsJTPUBmm7BLjUU9+Z2i4RueytVV1FQKyaq2QqzFWynwil 6eg1n/xToh5S0XwiKpOuOFv7r0xq90TrK85zuzcwmLr2SYzEzQiemt67XYp9CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957449; a=rsa-sha256; cv=none; b=Q93W05uPH0htKIAImC82vZh2QojqXI3Jmbjj3RC2d+v6VGYCNzGXnx3xnyDlDD+B2lbJlb 7Nf39L1K4TmoW8JapeyNEQjzjIj2vvvnl0TpciZ30juqeH+oa1M7EwcrdgI+xqtESQ1FkL n+tD6hIDaFfbppLyfrfL01FuGNDZCdyS+LNUVUBFqydB5v8CwDpwShVT12kah1LwoFGDci bI1gRyzUn7dOCr9uMD+O9G8mhRiogb8A1gzMAA7Y9R0xxuq/QjV2B6DRz86Qj7yAXuhlHc wGMHKU1T+nk3RmI3l6w3Auu2EsQFwHjZr3YzsjQAUk6KlN3vMReDvlzoK5QONw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjQ10vtGz1HFr; Mon, 22 Jan 2024 21:04: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 40ML49sC081106; Mon, 22 Jan 2024 21:04:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML49oT081103; Mon, 22 Jan 2024 21:04:09 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:09 GMT Message-Id: <202401222104.40ML49oT081103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 97a4045aaf36 - main - virtio(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 97a4045aaf36079f54ee05a8cb314b8a90f20af8 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=97a4045aaf36079f54ee05a8cb314b8a90f20af8 commit 97a4045aaf36079f54ee05a8cb314b8a90f20af8 Author: Gordon Bergling AuthorDate: 2024-01-22 20:59:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 20:59:06 +0000 virtio(4): Fix a typo in a source code comment - s/recevied/received/ MFC after: 3 days --- sys/dev/virtio/network/virtio_net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index 4dfa4d3341f0..4b728f7af21a 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -210,7 +210,7 @@ struct virtio_net_ctrl_mac { * Control link announce acknowledgement * * The command VIRTIO_NET_CTRL_ANNOUNCE_ACK is used to indicate that - * driver has recevied the notification; device would clear the + * driver has received the notification; device would clear the * VIRTIO_NET_S_ANNOUNCE bit in the status field after it receives * this command. */ From nobody Mon Jan 22 21:04:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjQ25DNkz58CWp; Mon, 22 Jan 2024 21:04: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 4TJjQ22sBnz4Hm3; Mon, 22 Jan 2024 21:04:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUisZGZW8SyhQZEr5aR6r+O8/Lq7otIFxYNxShZdoXA=; b=JD+rL59yrYecel3E53N7i/zoJuFUturcnQtfe30NW1/5RbXJfaH37tfpLPqUnuB6wqQSgY gtOOukstlFL38PSz5V6Xd7aSMRXTIdMhXTzzJ7rvbVNx0xPmVzt8XU4mzPa/9226H3o2Kw RWLCTcC6HI5qTcmaXgaVzvq0IakRRUz33LQgMoPyRDB/A5/y94WgJxAGad0PULrFU8j1Qc qLq0p7wPctTYP5K4FTEnTpob7c27R30ZAP0Dew6moOJqQXZxpYkHJBwutTuV8QgHv4Ypl1 WNYpS4Yfkilc9HlXwOqwRihHoXbCcWRVCpHpPqmRdnOTaCev9MvEQkA6+rKpIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUisZGZW8SyhQZEr5aR6r+O8/Lq7otIFxYNxShZdoXA=; b=u48W1lP5/cyTG+UBeT8hLhUH/c3+Pp6Y39R4n5uhf1ES6tFs7YbKj2tOWB/XBJQJaZ/LNM ZEA0auX+yk4AfU8NvVXerl5R0tA+5q98yySxfThtkOpPJRzBqc1TTAgCkPbATfW2VayLZu kAKwru82VzxD2LtJFgVy2M0DgLZVtL+w6Op20ibA1ViKqVS/j7FgSd2S9cT4DLSeIsjJ8G SoASmYmrzDYX4iN53zD4irICKDBhPVRqAxkm8oJREW1BmE+9xVfwxxWiUOIpOQXe6jSsk2 ly2tiOIwZBFu83f7F0J+WZM8Vz+5PzWPL8UweschJuHKnLzZZpy3VGbT+LBCmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957450; a=rsa-sha256; cv=none; b=YtNzRNYqeUr7m8ie+ORJnpbHNFPPYXuS3z+1wb1Drbu5c/yLWKk+nIf15bN3FLQguyHi/Y YasVYbFKHzbYOFZcix1xmNOhSKMN91NqbcFJKJm+IkyzQZj3CMt7pKeJIgfglBOfpM6C3q zkNzQyBBeJXFv3eMmEpH3XBBwZyskFMzUJK4oWrUrH3o3xRqdxXqlkPh65TgZK379j/z86 EYZlpGlTF0co89PwXrPV/cGD9MjGDylcTw4+rIUu6ciQVl/1sy92ed42cykuavkKNcC+gd QFdlo03PGdH7juaFohddEp7DMQNLsl3UtMrvc3ZLxGDzwbpRru3Hkc/tui9EKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjQ21yTwz1HKL; Mon, 22 Jan 2024 21:04: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 40ML4Aou081162; Mon, 22 Jan 2024 21:04:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML4Abo081159; Mon, 22 Jan 2024 21:04:10 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:10 GMT Message-Id: <202401222104.40ML4Abo081159@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: ad92f3d9d0b5 - main - meta2deps.py: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ad92f3d9d0b56ee723271152cec9174f74e17cb9 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ad92f3d9d0b56ee723271152cec9174f74e17cb9 commit ad92f3d9d0b56ee723271152cec9174f74e17cb9 Author: Gordon Bergling AuthorDate: 2024-01-22 21:00:36 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 21:00:36 +0000 meta2deps.py: Fix a typo in a source code comment - s/follwing/following/ MFC after: 3 days --- share/mk/meta2deps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/meta2deps.py b/share/mk/meta2deps.py index d7820ec71b5b..334a008a2ab5 100755 --- a/share/mk/meta2deps.py +++ b/share/mk/meta2deps.py @@ -197,7 +197,7 @@ class MetaFile: def __init__(self, name, conf={}): """if name is set we will parse it now. - conf can have the follwing keys: + conf can have the following keys: SRCTOPS list of tops of the src tree(s). From nobody Mon Jan 22 21:04:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJjQ36KV9z58CxW; Mon, 22 Jan 2024 21:04: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 4TJjQ3404Zz4Hjp; Mon, 22 Jan 2024 21:04:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKGQwb0kOa/T4wgAoIjaKPKNbQGsnN0q5bgyLqUGsOE=; b=CjB30DVjFu1PzQ0haPgBAXYARANSJupclKC8DLRuYJbIRIqSOmNXHjgPZ2g1cT/UfvNUng bEXDfKX1Nx4Df9iMXICwAESel+gsUsxoMVeYvih7tYZ9V6aWaYMY2s706x2YujIwthg+Z/ naN8e2u3zdsKXSfMTI/dk6s5b9wK/4XVRPORo9Z+A2FLl5PGUDogBcoDU52HGB3Muq33DU FA+/ytKIWgci4XDuLX7zneBru9ffo0rufspONw5jiRfsVFt8sMtVTgRmD5CDCpoFkgjWps jsgiZ2odMFyCaSAf4RFXWOgL7GMXdF69DupMnypewGJOLdGoGQAOCNP9vLV3Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705957451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKGQwb0kOa/T4wgAoIjaKPKNbQGsnN0q5bgyLqUGsOE=; b=G5uLjMszAOxFXKePw7O1aAROnRt6Fr4SkIAoYGVdoOlm5apUyPYP2zH8h5C9ovDBFhK1uQ AChx26xVVc99IetwFi4tFz3LQmG7wE48YTa5/7ae1ZRK0JQxBTxKgY36OrmawXgMhIqTFw OKylnAgKJ9tQ35baLQmpFH+pH32UUR4/LscvQzRywPDHiaCMisVNAODEHi0b6piecDlWc8 Jy3H/gBebk8EM66DZkLK6TEfLKbAqpGk9ziVsR/zW2lbtWfr4ZbTh5akql3gKIIw/gXgV5 sgP1IIAtmJX+lL9NwPIqhpZqMbsO+4fwwKutuW6q/GHpFx2fD4Rz5ZYgcxgWWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705957451; a=rsa-sha256; cv=none; b=miT8etr9V4ntDRXZs2I8rYZHNIsaPWMeMhlmoOOt6oxuY2OikYBsKChw4feexUCIz31kkz Viv/kd91M7XEzlpL1q4oW3drAf8nwEtYTZtqLeuV78JzZYQ5BUO/tqmen2X0E+Mo2TCvcQ 64N688NmKNcXx39hDTsvqKtlCKkFfGW8GcpYS8lxR5SbKXAiU8d6Kvs89XkHnN+Dr1wYea 4SqS7TT3j9oVr4QWCbJ/crl57LUFMeTcLQ3MWyADTEKJqSjn810MjTiGXI5tRujBydFQH8 t0Vb8ucQPvvNxBYG77dg26AV6P7a1Ll30mSjE/ctaQd3kCqJvh8w/EgS8svD+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJjQ335BGz1HGq; Mon, 22 Jan 2024 21:04: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 40ML4BX4081216; Mon, 22 Jan 2024 21:04:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ML4BwN081213; Mon, 22 Jan 2024 21:04:11 GMT (envelope-from git) Date: Mon, 22 Jan 2024 21:04:11 GMT Message-Id: <202401222104.40ML4BwN081213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: e125371fb6ff - main - dwc: Fix two typos in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e125371fb6ff22d452c5ae90d3787432b8bfa0d1 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e125371fb6ff22d452c5ae90d3787432b8bfa0d1 commit e125371fb6ff22d452c5ae90d3787432b8bfa0d1 Author: Gordon Bergling AuthorDate: 2024-01-22 21:03:29 +0000 Commit: Gordon Bergling CommitDate: 2024-01-22 21:03:29 +0000 dwc: Fix two typos in a source code comment - s/recevied/received/ - s/descriptr/descriptor/ MFC after: 3 days --- sys/dev/dwc/dwc1000_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index c510c252072c..44b9f0d114bf 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -363,7 +363,7 @@ dwc_rxfinish_one(struct dwc_softc *sc, struct dwc_hwdesc *desc, (RDESC0_FS | RDESC0_LS)) { /* * Something very wrong happens. The whole packet should be - * recevied in one descriptr. Report problem. + * received in one descriptor. Report problem. */ device_printf(sc->dev, "%s: RX descriptor without FIRST and LAST bit set: 0x%08X", From nobody Tue Jan 23 02:17:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJrN20XfHz58gbs; Tue, 23 Jan 2024 02:17: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 4TJrN16nglz44yk; Tue, 23 Jan 2024 02:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705976274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3gYiN/nnw8qA21v2MnhSof3Fz7sPpqe13cvcHlUBoI=; b=W3Gpsdzfbi0gn2hXIolt8F/5bS/4RMEd25XB3CQndudFTqoMGKjVqhhtCo9Vg90jDsJ9zD kMvZ0/zqNGRbGVhfbtByPLahAjt5Z/2emdG33r1YAVmu31aO04alhe6GNN8h/bDEfEWcaz 8CbCLS5/KVvStCA5iMc9Dw42BC7AhotI1bc8EM0THqu1NL5x9ziC4qLI+f34ElnziTKYzp yuIZ7H/XECcvvo/m+B+otC5Az8dBDfT/Qo/GV3V6KfIyinsScRfLthTbjvo7URx85nMWrQ ZHvU7OS2zvhoDba1VMPXh9kMJtd3TjNnhmyS+k6Du6Ojt/BS82KVTmm7+5xdkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705976274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3gYiN/nnw8qA21v2MnhSof3Fz7sPpqe13cvcHlUBoI=; b=coIqkyFh6dzcC1Ld6LfxdQMNOeAYBcZvfZ+yHb2Ke69F0GgQcVUMfGdK/hEvm7g86SqaqI 36aQz50Png102Plje9R3kFgD/1vVtu4QhExmu6wt6KGCSPm50U3Yu3WEr6+iu3i5q3Gy9f ZvUikntHh8wLOBFEwnoKQC9Xe5V/HiC+e9Cx+qmOyHYmJDWanSaVLGvS6NZsmqtWSFRPo2 el27csJoiDaN/cDQnQRrq89KFZQfxXSAOo0445KW/wXO8J/Z/kzAfx4JvdgQtolnrYapPh RWRjGancg45mMRC71Oo0CTag8MU+JZN8BCFMGAAcu4JX/7xd8y9SDujHzhPnyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705976274; a=rsa-sha256; cv=none; b=RJAW94uk9sw4PgmVD1jYiSGXaTdzkr0FFqdoHY04Ia7SEDchfKHRFk+BG9Zccp+BbN605R Q1TWCXd5cda5bzVu0oS3KdHDqpCDtVPCuCu9OHKCbFY+bByr+1I8KsGufh9bDvl7mS4ovk cFULpdHkylwjacxPjhKyhyjVOc0464N/w5izughxY23Vdnnh525voI5ps1FtqD+GZUl6sA Fzj5EZr7dMeEYYn+u6fKkFTkpFkp+US5Gg+K3ZSBb+MNvjDtud0BWu/eYlhqP1PWKISASP OioHrthpEBGf9/jIaUTEJwRE8iPtysHnJuQ0Djl/BLlSi1DiYxvNqTxd9oasnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJrN15rtTz1Q8d; Tue, 23 Jan 2024 02:17: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 40N2HrGP004495; Tue, 23 Jan 2024 02:17:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N2HrJN004492; Tue, 23 Jan 2024 02:17:53 GMT (envelope-from git) Date: Tue, 23 Jan 2024 02:17:53 GMT Message-Id: <202401230217.40N2HrJN004492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3f4f82c0d779 - main - bsdlabel: limit to 8 partitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f4f82c0d7791bddf2d6f2c29d9f2f8c48c712e2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3f4f82c0d7791bddf2d6f2c29d9f2f8c48c712e2 commit 3f4f82c0d7791bddf2d6f2c29d9f2f8c48c712e2 Author: Ed Maste AuthorDate: 2024-01-23 02:05:58 +0000 Commit: Ed Maste CommitDate: 2024-01-23 02:17:23 +0000 bsdlabel: limit to 8 partitions bsdlabel is intended to support up to 20 partitions, but the disklabel struct has a d_partitions array with only BSD_NPARTS_MIN (8) entries. Previously, an attempt to operate on a bsdlabel with more than eight partitions resulted in a buffer overflow. As a stopgap limit bsdlabel to 8 partitions until this is fixed properly. PR: 276517 --- sbin/bsdlabel/bsdlabel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 2c03117e344a..b831c8ba4ec6 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -50,7 +50,7 @@ #include #define DKTYPENAMES #define FSTYPENAMES -#define MAXPARTITIONS 20 +#define MAXPARTITIONS 8 /* XXX should be 20, but see PR276517 */ #include #include From nobody Tue Jan 23 02:54:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJsBj2WPRz58kdy; Tue, 23 Jan 2024 02:54: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 4TJsBj0TGxz49pg; Tue, 23 Jan 2024 02:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705978493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=StZNmg+oGLwIU2ibFUqIkQy3euLb0YNjJeNX2LLi7L0=; b=VbDZnFJgnaf/Z2KrDUa5kZhygOChjKOC2kFa7H9Xuhr+MkpdEXVlZKMZk6hLW00xgtP24A G8xJEa3zvoW+VCcr/Jf5o3yrcEY2QqBeCytwzieSiS4DtPg4dJWdvXFZ98UnEuFpm4yibJ 46+PkXIrBcMSjaFtuMfQY1xDKjUQOk+DdN4819oYou9efhtGVOJoq+792SBFGSxt2OCTI5 I2YdCfY8akrFUsIMzBgcROl2mFYfrkaugqAsuhjRSDu8PSFCijzmX3tq3wKgzW3q1KryDj i1b0wWnFFwelMQjbM7Jylh52IZGoJS7450g5VzNTohFgNBvLfJx1ZEJUyBiWFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705978493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=StZNmg+oGLwIU2ibFUqIkQy3euLb0YNjJeNX2LLi7L0=; b=PvdNoUoGAu6mx98bB11y2SJs4OwAdwN6XNjw1NnehZ+AkSvqXX23484o6fDgayqBHVFLur zpYAje9MJoLUmMT1IWzYuBLPGgfbrD1y45DTPZwh1zuQmL1wFEWhKMsUzGsfH9SviNFm7I JUm/lppjfxXx4jKsn7AxQVIaAkrn3Fp+ybDAOLmhuZ3VN0r1L/pRK3oKE4pMF/02nmh7mK V5JmLA9ydcHrsELmkroG5n5GJUmXkXsA3VFRTuvewWd/rOri2JiTDsh+fwdshyyX94CqNR khML6Lmrb0fbPR1UOTssiu85sbYujlPhhUvjoISyhcrX4wls2N0FLMHfYKshpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705978493; a=rsa-sha256; cv=none; b=UI18JkTQ0pHaE8oa8eaH6cxRVVFrR/1MCGPMrSJIlspJF3phpK6HQdj/KWy/wlpfN/LD1F Ifj2KIpx6ui0ht13rNyCz2JYXjhMNfLrSMN+nJ9GSWEGXdglTehUJ8Cnw8m64XPuxVkyYO /moipnaUHCGBPHvP7mIxLXacRMnZPvjTPoiZqSRXUoJcBipiypJYZy8FS7QVwDBTlBpYwG I1UreJmAEqcMZURNGOCmAUoMMy0YrteXm/np/hjGFrHoNJ2+NunE7fkaKcMkfNaIJCZhdd x+z1hJf8VsiwuTCEwIohgXfWu80gu/vT5tv5Pc978YA82jPYKeiUyWBgbjaltw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJsBh6g4lz1RDG; Tue, 23 Jan 2024 02:54: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 40N2sq6G070181; Tue, 23 Jan 2024 02:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N2sqGt070178; Tue, 23 Jan 2024 02:54:52 GMT (envelope-from git) Date: Tue, 23 Jan 2024 02:54:52 GMT Message-Id: <202401230254.40N2sqGt070178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: a8b2189c90c5 - main - arm/mpic: remove empty pic_init_secondary() hook List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8b2189c90c52e43e27614b2cca6b753a70da0ca Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a8b2189c90c52e43e27614b2cca6b753a70da0ca commit a8b2189c90c52e43e27614b2cca6b753a70da0ca Author: Elliott Mitchell AuthorDate: 2024-01-23 02:52:37 +0000 Commit: Jessica Clarke CommitDate: 2024-01-23 02:52:37 +0000 arm/mpic: remove empty pic_init_secondary() hook The default hook does nothing, so having an empty handler is pointless. Simple cleanup. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40475 --- sys/arm/mv/mpic.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/arm/mv/mpic.c b/sys/arm/mv/mpic.c index 15574e409001..232eb8556948 100644 --- a/sys/arm/mv/mpic.c +++ b/sys/arm/mv/mpic.c @@ -149,7 +149,6 @@ static void mpic_unmask_irq_err(uintptr_t nb); static boolean_t mpic_irq_is_percpu(uintptr_t); static int mpic_intr(void *arg); static void mpic_unmask_msi(void); -void mpic_init_secondary(device_t); void mpic_ipi_send(device_t, struct intr_irqsrc*, cpuset_t, u_int); int mpic_ipi_read(int); void mpic_ipi_clear(int); @@ -384,7 +383,6 @@ static device_method_t mv_mpic_methods[] = { DEVMETHOD(pic_post_filter, mpic_post_filter), DEVMETHOD(pic_post_ithread, mpic_post_ithread), DEVMETHOD(pic_pre_ithread, mpic_pre_ithread), - DEVMETHOD(pic_init_secondary, mpic_init_secondary), DEVMETHOD(pic_ipi_send, mpic_ipi_send), { 0, 0 } }; @@ -565,11 +563,6 @@ mv_msi_data(int irq, uint64_t *addr, uint32_t *data) return (0); } -void -mpic_init_secondary(device_t dev) -{ -} - void mpic_ipi_send(device_t dev, struct intr_irqsrc *isrc, cpuset_t cpus, u_int ipi) { From nobody Tue Jan 23 06:43:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH06cRgz57Njj; Tue, 23 Jan 2024 06: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 4TJyH066c3z4YHf; Tue, 23 Jan 2024 06: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=1705992236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8w5+xr93lIvBiC+0ZBNrveNAcCRRxA76KM8qDe3gyE=; b=RMhyJjAC+Nxc2HtB1lvxwpy+/SM7Nn//KygqU+V08qy4s+GkhdiQnbGmCC5nHT6CT1umtN ZsLVghJTgcTTqWWnPh8UIx/lHZhQZPDpjyv5LL062QjCqm0fcNWWL3mMxN5VyhBaenyeqW iIu2mgxVaMTtZJKhwB9crV50m5qZdfL2pc3Nzo88ewH5Vc+1uq7ydRnJ2L6eMIR1NaWaCK 753R7Gw+J0W0R1m/krcySkpSy/IrC41Zjg40bwDKinjcouIUbLI+iNTGOLV7PoHUxXT9fW lFHJw5sW3b4hUXC0fRjy9+uG5kidqz7cCKK9C6ST5nZDO/lq1iIuG0ifbZmaSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8w5+xr93lIvBiC+0ZBNrveNAcCRRxA76KM8qDe3gyE=; b=G8Yth1zhjrOjK6ljVSVTTRaVm75BtGdzO8Af4kgX6rRU1cnjEat8zMLtFdJyq8Rtnc+5XB v0BoNN8Denic5VUncsVxwMTh8rwSJ//iMcvPFXJi8Bj9jvgPhPt+n7A4+XhESdF5TLkQYh Xq/EZyajjub2nnvERcecfu6TaXM9AtI3anBRTxm5QYvbCHzAKFIHLITamls1l9CToM7yzq k05pHMbnIWE++VOaHL1xCeDYWnTX/uB3gkCI3a++wf0IetzvCO2f6nHz0yrwEoo/5lBr5N 5ws4bR0gTmDKXZKu7T4lkz8sj3q/dB06acQHaZJDbxOGdg2Mxx7Ci4vNCmEqGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992236; a=rsa-sha256; cv=none; b=FGuQSxRQfe/F6vD8zenxtfCXBfYus0DfWzclk/Txa9ANch06kFkeoGYTWuK5LkKdPAx52A 9FHOrQmC7KIDkD3nYg4EKcqT3FENaR7yGsrfQ0XaC6hSLUX8E300QZ6B0z15uUic0k1Tjx xtGLE1vtjsiyGRvH4N3X556qen6jfOLgu/7w3BaSYUea8UcY1+fsRJp6YvNqDdqx5tu8pr lZ3gDuryGpUXOFqde8KG1W3u5KUYuiyHGDDPbauX4uhJo4KYokWQwGPVBXvVO0R3JtpVgq 6XGXhNimIhaSdM3sTJVZQ96eK1NToZVZ9sxJwrsRK5oq0eidWiBNWCMPrV8RrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH059DGzKHd; Tue, 23 Jan 2024 06: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 40N6huXR056311; Tue, 23 Jan 2024 06: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 40N6hu5B056308; Tue, 23 Jan 2024 06:43:56 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:43:56 GMT Message-Id: <202401230643.40N6hu5B056308@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: 9509e32f9e33 - stable/14 - _umtx_op.2: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9509e32f9e33bccf1899ebc2638a1c4cf0b43a65 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9509e32f9e33bccf1899ebc2638a1c4cf0b43a65 commit 9509e32f9e33bccf1899ebc2638a1c4cf0b43a65 Author: Gordon Bergling AuthorDate: 2024-01-20 16:26:34 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:40:33 +0000 _umtx_op.2: Fix a typo in the manual page - s/interpeted/interpreted/ (cherry picked from commit b2ec175fcaac90fc6a1caf066656eaa092f32611) --- lib/libc/sys/_umtx_op.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/_umtx_op.2 b/lib/libc/sys/_umtx_op.2 index 9c0f1f425e47..60f90c32ba35 100644 --- a/lib/libc/sys/_umtx_op.2 +++ b/lib/libc/sys/_umtx_op.2 @@ -424,7 +424,7 @@ regardless of the kind of backing memory. Only the address of the start byte of the variable specified as key is important for determining corresponding sleep queue. The size of the variable does not matter, so, for example, sleep on the same -address interpeted as +address interpreted as .Vt uint32_t and .Vt long From nobody Tue Jan 23 06:43:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH20sT9z57Nlj; Tue, 23 Jan 2024 06: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 4TJyH20MJfz4YbH; Tue, 23 Jan 2024 06: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=1705992238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLtlFjBfaaW/AdoEY7zDbIuRcSAzoICE4ckdErMFDsM=; b=XKZaQydkLNn0mkDTrI9jXnyeyeofp1BDxZllo9c98r+Xs3AO+LNBpolxkSpprvca/xiOcF BliCGDAfhfX0h7Y/BiCHxIwcRtKZZJVTgeyIEwa6HCPYdtlTNOyR9K+Fz1iSIqnuHWhWz2 9Zto8XYzKf2GDkCmM1BjeszuCfcfa+ezBNLzxE24D26dC6sEaLGMbtJ9XSPkxG1TWSmCga 5V2fb5rqiwuJvSbYqYBbwJCHZLJQMLIjKvT6HmVmHDBHkIjXGNzQWQClRfQA4VM6pgRUtK lt2y46PSYyFfYWShUWErBVNt0zONDrYuigDUP386y9nUfhqYCPCS8yJY3blSvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLtlFjBfaaW/AdoEY7zDbIuRcSAzoICE4ckdErMFDsM=; b=nluz7UCHcJYUZVU1l1ow9d0nOBCdq1IL4p1gr+1LGNyObv156/GcZ+epugJ11A8La8AIM5 I6iLiQzlxTmeYPFn9NUGInaJg5lzcO5dugPqPHlvgINgNS8P9cIxEXDhXhg1ulP3brklpD Fnak3Sb6yaXhW85JFI35sq6g1S5i8Wvahxp9ug48uCUTqPtLV1afxyrY5PiaDKOVW2MsKc noFaL/7P9VANFlbRJrK4vvjrNgagpEeBxfQ6WImXWK5KQkrcDTRl3cZ6d8KEbouHgEVfTb HRcqEaGf0fYG+AF1NrGavUGNPAQgBfUtdWVWKWWViMLddbnGWZLLAu6zJr5vVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992238; a=rsa-sha256; cv=none; b=WJyeYV8zxE6DAxL9pEZIu9+QPJPvBGdQzFwXm0b4iYsG06iibVp1yN5C040ckiQkB2BirM bJ2PSeWvFPOHmb8MWWKqs7xrkpl9RiJrPPsdZ0oQXxxYOXh9wRQZT7UkQ79VeeL/LtrBgg jWLZuFhOncnPKOiLZIk5xhwv38hzhIeklPouHdXBGRnRvihKpLUY5OeTajG5fVovU/UQSG Zlx1OaoFtZIyAHDYiPz6hB5zuTUHzrQ5JOW/e+jN5ZWDz2t0h4KPykNRIsLSxP7PlhLVfm bQM4pu9RkmIOTZYxuea15zM5EYest4dmS+YpsctBCgObnxlqYJOYKIHi5rUWaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH16SbyzKBD; Tue, 23 Jan 2024 06: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 40N6hv9K056365; Tue, 23 Jan 2024 06: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 40N6hvrA056362; Tue, 23 Jan 2024 06:43:57 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:43:57 GMT Message-Id: <202401230643.40N6hvrA056362@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: c065e2673c38 - stable/14 - atse(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c065e2673c38fe786b9dc654da1163b92030091b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c065e2673c38fe786b9dc654da1163b92030091b commit c065e2673c38fe786b9dc654da1163b92030091b Author: Gordon Bergling AuthorDate: 2024-01-20 16:35:51 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:40:48 +0000 atse(4): Fix a typo in a source code comment - s/addresss/address/ (cherry picked from commit 2b1e4e5be3047411df5e4d5442aa7de6489a0309) --- sys/dev/altera/atse/if_atse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c index bd252693e6df..923292484207 100644 --- a/sys/dev/altera/atse/if_atse.c +++ b/sys/dev/altera/atse/if_atse.c @@ -580,7 +580,7 @@ atse_get_eth_address(struct atse_softc *sc) sc->atse_eth_addr[4] = atse_ethernet_option_bits[8]; sc->atse_eth_addr[5] = atse_ethernet_option_bits[9]; - /* Handle factory default ethernet addresss: 00:07:ed:ff:ed:15 */ + /* Handle factory default ethernet address: 00:07:ed:ff:ed:15 */ if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 && sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff && sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) { From nobody Tue Jan 23 06:43:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH31QNCz57P5k; Tue, 23 Jan 2024 06:43: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 4TJyH30s03z4YR8; Tue, 23 Jan 2024 06: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=1705992239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0eHpTl01aVGh3tujFsOeEzWtONGMWWPursrH91dnkY=; b=pz8rSbOW5evI1zc7Fjpw4APSwU+3vxpvZ58CHh+hBoZEHWj4HjsEG8jUTJyfQI6WsqYe6u UDDCgRIiJaGa+hIQlRcot/yqKWDF0aP63lHkZf7ShMAb5zkPUE64i59Olc1BJggYrdc5pH i7YB7RDMjQhOv8ys51dLAWgJbF/BPw7yVUuyWBKVuuBuC/WYF7awPy3RaZGxgQlxl9fz9E B4+1drCzykXN93rT5H+z+5cptY10ycdwotc7AFR0+O7CD+1TCYPJAUPfCmA4ebOTlosVK2 jXANNJidC0lguuGcQaf5DKl8mIMT5TQfZK0JFiQHHXglCH4Y7MtRIpCb0UkO2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0eHpTl01aVGh3tujFsOeEzWtONGMWWPursrH91dnkY=; b=ltBml5kEw7ZuWCb+ZLKA49yYx4Ee7nIyiPw/RTYv40HwlUSCgUNXIEWVKlXjSp/N1Owy6Z 9ezHNcaNwFNorSltffFo09okEBD/nCzEZOGwttfL6jjEGGvf+I1cBM4cwUskcmz787IYvm odwY45weNlz2Sl2k7wFhCLqXX+sfQwTjO94lEcKYARQfubjCtcvQhAd1xMM+2H3EryJaWS OEki4pX8JRbqOJgl4/s4YsizpaOWdqkxuDS1hdM4Cx8ggdK8bfl0iaIphyeamDW7ccrAQi +ZhZljKLD9q39kloNe94z8PSnPXYZC+iPR4vTMaSAorKM88sir3U79uEJbmSUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992239; a=rsa-sha256; cv=none; b=T1ZPuvxZX+LpXo6z8c+Spc0Mm7vel7Pq2YrZEc/CwtA7uNdjskpXH6Uyhxqce+rr4TbMLc cr6AvOn5wFdUY70tO2zDapAU73Ku7ZBu8jY5QKEwkvYjIHAXINwQm6u2eyPRMOwwYniqnC azPkYSaq/sqI3H4sitN1/HdYSsfXlpDzvGM185lSCxRs+HicaE4QpH9h0TV4dpSmBPLP+x vEAhCn0XoIio37PJRDBdCPzeljMQBlNDfnoePeV8RiC7DuINCl00puRoiIEl7SBzUgEmN9 MxyVUma3b1uiOe+dm/42CZD4i+0k4xFBqARL9/74yC7F/3gfVJHy4OyTri0puA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH271FLzKHf; Tue, 23 Jan 2024 06: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 40N6hw2q056424; Tue, 23 Jan 2024 06: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 40N6hwAv056421; Tue, 23 Jan 2024 06:43:58 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:43:58 GMT Message-Id: <202401230643.40N6hwAv056421@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: bad1f5985710 - stable/14 - net: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: bad1f59857105910e99637832c258c8b092fd868 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bad1f59857105910e99637832c258c8b092fd868 commit bad1f59857105910e99637832c258c8b092fd868 Author: Gordon Bergling AuthorDate: 2024-01-20 16:28:12 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:41:03 +0000 net: Fix two typos in source code comments - s/strucutres/structures/ (cherry picked from commit a2fcd3af5c8ad43e8d2c7b89f7bbe3edf2f22e2a) --- sys/net/if.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.h b/sys/net/if.h index 4d5f4789599f..4c3cfd06ca03 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -338,7 +338,7 @@ struct if_msghdr { * extensible after ifm_data_off or within ifm_data. Both the if_msghdr and * if_data now have a member field detailing the struct length in addition to * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following + * ifm_data and the start of the socket address structures immediately following * struct if_msghdrl given a pointer to struct if_msghdrl. */ #define IF_MSGHDRL_IFM_DATA(_l) \ @@ -380,7 +380,7 @@ struct ifa_msghdr { * extensible after ifam_metric or within ifam_data. Both the ifa_msghdrl and * if_data now have a member field detailing the struct length in addition to * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following + * ifm_data and the start of the socket address structures immediately following * struct ifa_msghdrl given a pointer to struct ifa_msghdrl. */ #define IFA_MSGHDRL_IFAM_DATA(_l) \ From nobody Tue Jan 23 06:44:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH433q9z57P2L; Tue, 23 Jan 2024 06: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 4TJyH41ylTz4Yh6; Tue, 23 Jan 2024 06: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=1705992240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V37TQ1UUM+nmBY9glk4E8SXiewd674K6L3my1twAcVU=; b=dlUtGOjt6N7yc+9i9uK+LaMAEf7ICOchust/7NHBZiv4koLQek7kE89PmoWMY7qmj7tZVc 1U1uwbX36cB6HS6BpH+uIX2m7OClNLsBfaN3R5zXjXFl5njwLHRCYRpvQMEj1kg5MK9NhS bOtskeC8Le+Gl4naLhEWVVMvLYHqfU2rCGrHIi0ermV/DKNSfEnL4Wc/7Gm71Bxo/5Rd4u ohPq1X0rgGG6onV7KwbBwOC3eONEpYtmHJjWXUHB0CxmjDNncYCIdvI4RSKBrXA2NKcGZK do2pNpj3d/vpXlatu4Fs32PMfnnbHfp7U+aYIAeXMCevbQPIfPXLKjpCzsjR5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V37TQ1UUM+nmBY9glk4E8SXiewd674K6L3my1twAcVU=; b=RxpSBpVtZhNT/+Q2LfewyzRmQtC81XI/8BbV5vrBxmCSHpObADpGiprwwSa4xzo9o3Tm87 63zkBbEeN/6799sw6bygu5wWJXF7iWOEFqHkvp9Dec6Ax/jl58+bCYLS3i8quK0EVqV+hl XK+82CAbNhSZrLA9eenFTdJKVsPWpm93gpaSJ6tubBdJC3QfniliaO0BUoTi2DZKfu2VNj okHHstUfr9pfGZg3YQEfxq/Tg0MtY+uby0WAbeVgI0WuO8T8K3wf56xd3/LTCspXStGkqw Y6mtGLGkGqWJ5VE8vWAm90CIovPoLs6H/9MUKKN/27U412wWsZges+qjL/ZXKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992240; a=rsa-sha256; cv=none; b=Ey7lMvxkMiRf1tU1i28cGMEdWAHprpdT8xeyCnUR4Yhu3IfuH5yjbRTis+rKuPZUkBI76p Ob7VLnpndj2HBwPqszx/6CEIs6asoY3vK3+AE1QtrpZivu7nOchbVxpwlwNlmOEb2dzCBP ZwUuwggHf5qjqjC4Ag4pEC4onr9kvPb1XIRSHDN0VR3UVhx7QtTfbMx/ukvxhV7FzCazeO uFYDof25+sCOpL44AbiJ9cGhef4tKk56n+sMrJ1H+TFtzeduMrefQuFd/997E9rsPhuKdQ zYpFUKLN0iKuCYSQeh62IgKN6F91S/MBoUxT8N8l2e1y8M8iYDANJYMm1z/shQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH40sLWzKHg; Tue, 23 Jan 2024 06: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 40N6i0Np056504; Tue, 23 Jan 2024 06: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 40N6i0If056500; Tue, 23 Jan 2024 06:44:00 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:00 GMT Message-Id: <202401230644.40N6i0If056500@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: de3e802b9d13 - stable/14 - netgraph: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: de3e802b9d13009ea9baa4245f0c6a8451d3bc3e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=de3e802b9d13009ea9baa4245f0c6a8451d3bc3e commit de3e802b9d13009ea9baa4245f0c6a8451d3bc3e Author: Gordon Bergling AuthorDate: 2024-01-20 16:22:28 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:41:16 +0000 netgraph: Fix two typos in source code comments - s/bascially/basically/ - s/simpliest/simplest/ (cherry picked from commit 7037ebe63dd1a2ff2a818359c58ca24b6d44388a) --- sys/netgraph/ng_sample.h | 2 +- sys/netgraph/ng_tag.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_sample.h b/sys/netgraph/ng_sample.h index 994f322cf05a..f7f7cb417626 100644 --- a/sys/netgraph/ng_sample.h +++ b/sys/netgraph/ng_sample.h @@ -73,7 +73,7 @@ struct ngxxxstat { /* * This is used to define the 'parse type' for a struct ngxxxstat, which - * is bascially a description of how to convert a binary struct ngxxxstat + * is basically a description of how to convert a binary struct ngxxxstat * to an ASCII string and back. See ng_parse.h for more info. * * This needs to be kept in sync with the above structure definition diff --git a/sys/netgraph/ng_tag.c b/sys/netgraph/ng_tag.c index ea84148e59ef..31417417c0ed 100644 --- a/sys/netgraph/ng_tag.c +++ b/sys/netgraph/ng_tag.c @@ -258,7 +258,7 @@ NETGRAPH_INIT(tag, &typestruct); * One could ask why to have this structures at all when we have * ng_tag_hookinfo initialized to zero and don't need in and out structures * at all to operate. Unfortunatelly, we have to return thisHook field - * in response to messages so the fastest and simpliest way is to have + * in response to messages so the fastest and simplest way is to have * this default structures and initialize thisHook once at hook creation * rather than to do it on every response. */ From nobody Tue Jan 23 06:44:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH53v9Pz57Nll; Tue, 23 Jan 2024 06:44: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 4TJyH52pSnz4Ybx; Tue, 23 Jan 2024 06:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ll59L38nLlyo/dFknWDSU/lp/rSVvoTPaFlAYlxY2M=; b=tWt7G+7VX7fRKtKPD5C0bRGu8E/XjkbsCvErf9Z7ZubmgUtYuUWnyw+yB0q/9SrkW6ttDW q1waLPmR1qo+f1Po3Kpzd3HOwH9bIRfrXkwbWUvJeWKe00t7Xm7n2P6821Bi/wVcJd8GKC O5+tHlMJXYZzy78C1Oor/8gejnCutzGDyjwGw2lbheKxHN06LGik6N+jTP4QgxJ2n4E1Im BPeH3n1Y2iK86UoREczctHso8Tbx9zMZNBPlBChELYarP3H6efE2ORbsh2NLtoXZc+8G9t Flr+PdzZ9HeqEMvipmcw91BenHT/rWFwKO/OLE9yDDRuQGvg1RuwD6JeGk2yNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ll59L38nLlyo/dFknWDSU/lp/rSVvoTPaFlAYlxY2M=; b=cv3rfUk8IoqY3I48LsuKeSrM4xsA3U94OJKLh2PenJKQl4JJaGAVpdUALt6STjNOmY7HId 6gp/JaGHkfJebp5h5o6fvbvr+1nKan/+Zng/07S9Q/DEWzO+tiQOSewGPqt3urOJYOXR8c gAn0hf7g0LLb6bvQ/87B+7RkMKwoX+r6KXgE59RPCWamjfKUBWKzaunIeX/U71qQGY0nCY 7YtxvJ/lMOFfz0+JtSFmkF88G3XZqu2wbB1upN/7Zik45DlU3VEc1da1rA/+01gsnehvDT p2h+joVrB8O5kKkMyrCsDAJ92035gqKLjyNSkkSjnlkOs9/Lxb7gvGl7nr2eoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992241; a=rsa-sha256; cv=none; b=Dplvaq18m4PQlRwbrTCr3aPDmP8QJMHpyOHGTq7VK2AB1QbbALyEat0QW6qhMyq9RD/BUl Ie0p1+gsxX6oECvw++AGnnYRerKbj/bQASIU251j49ToWpcmvHHfzb/DzHNbapaVpLte/S 3f6wNtR5N5OSZW/OxAVU1xXUWcNc2xnBwIdjy0FTWmh4nZ6ZkwNmk2YUwKABx0o1ANH3ib kyI2x/+TKow0Hwh2XH+Fn5OXijA3CPtwp0Nz85mpYNoxY5J5skuo1SoPdWhhkcm3hQLHYQ rYBlHQJnTpKEOsm8PA/t8EFTSOm0xXmUhVFip+KbSXGl3KzFlh7UHdkBkWSwKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH51wfWzKVC; Tue, 23 Jan 2024 06: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 40N6i1Uq056559; Tue, 23 Jan 2024 06: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 40N6i1NV056556; Tue, 23 Jan 2024 06:44:01 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:01 GMT Message-Id: <202401230644.40N6i1NV056556@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: 2eaee65182be - stable/14 - netpfil: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2eaee65182be345c1962ea58c593556f8f33f44b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2eaee65182be345c1962ea58c593556f8f33f44b commit 2eaee65182be345c1962ea58c593556f8f33f44b Author: Gordon Bergling AuthorDate: 2024-01-20 16:30:57 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:41:33 +0000 netpfil: Fix two typos in source code comments - s/withing/within/ (cherry picked from commit 938918a9f478e94fbe65ba84510e4755024560be) --- sys/netpfil/ipfw/ip_fw_dynamic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c index 5b756cd4c980..283032048845 100644 --- a/sys/netpfil/ipfw/ip_fw_dynamic.c +++ b/sys/netpfil/ipfw/ip_fw_dynamic.c @@ -2456,7 +2456,7 @@ dyn_send_keepalive_ipv4(struct ip_fw_chain *chain) CK_SLIST_FOREACH(s, &V_dyn_ipv4[bucket], entry) { /* * Only established TCP connections that will - * become expired withing dyn_keepalive_interval. + * become expired within dyn_keepalive_interval. */ if (s->proto != IPPROTO_TCP || (s->data->state & BOTH_SYN) != BOTH_SYN || @@ -2563,7 +2563,7 @@ dyn_send_keepalive_ipv6(struct ip_fw_chain *chain) CK_SLIST_FOREACH(s, &V_dyn_ipv6[bucket], entry) { /* * Only established TCP connections that will - * become expired withing dyn_keepalive_interval. + * become expired within dyn_keepalive_interval. */ if (s->proto != IPPROTO_TCP || (s->data->state & BOTH_SYN) != BOTH_SYN || From nobody Tue Jan 23 06:44:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH65smZz57Nk0; Tue, 23 Jan 2024 06: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 4TJyH63v3tz4YWQ; Tue, 23 Jan 2024 06: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=1705992242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI+4aZjrU5x55PksprrG7ddboR2HDVRqAJ2h9lTphL4=; b=P9Zig03jjGx2YrJEwJxsA7e1gQCxC11KGwicfJ6dff83PxVJOh0jeyl1ZDY9nlhue+kODW ZsUof6w+10I1/8KmB4RAeQZ8O0J52Egz5FtxlBS/ZFvJHyyAdNBntW6m3Av8HC81e4A4bO YS+Domi52abd2B7CiZ7fjf1B8Lp1P+GzHyFc4YLBvG2TMLwxY5vEGazae72nALvox1y/Hw lessDfOY3V65dZEpQ7uu4ThtlUE/AqDl/0AM7yHElwx0wEQeWLPsvz8wTxeowQY3b2bNLE X+v3kmsevnlG3De8SqC1Jpwi+Y3tQym8XocC2VTJBcQ6Wu6geEPP01VXkPal1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI+4aZjrU5x55PksprrG7ddboR2HDVRqAJ2h9lTphL4=; b=ZrQPQ4ucvmwjV6jpATP95mWGZraoYRu0QG46MoIegNDS0wTH03KaAixEskY/1EnJFsObQp BHAyidKFWmYsAPF4QvkVhHEdndu7JUiqSrjNW+TRSAaeqS325GsTEGvXgpAII6Q7ac4Qhb IjG2yNnvvkXyQsO97fehRj5pAgj+cM4Q9b2OhsNbcFkHi+ydo6EMV92jPrxqC3isfJYJiF cQqg503ptoU0hU4/3Ckb8jpNojtUdodziUBgZ4/wbuuQHxUmjZ7mo+C5x9l45ifKW18sfs uL+IdTWDgQd6ZvoOEF5w1CzaH8PZxLQQ3mnDTsL+r+EgJ9NpRs/tZQ8zmiBkrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992242; a=rsa-sha256; cv=none; b=AKgV13hwmzELqhP+YSzHPn3j0hqRRkzbVAD0wqqx3t2mtXJuUW1MbJVqkdqYZkoVqXyLki kD571Yn4AxTp6USrPavEYrYEu1ytpmcRix9X+0us2GoHU/z6ibJ+FoFeJ1xz9/bMsK8QkM spgX4tF4dy+g1PDtcfilJ4IpbLpe72z8sXy6bTSfRwU5uqY1evoGvXDcZUJ0iJ+u+j6Ilo PW2M9sAUp6I7HM2huvNBEo9s0mj9Z46O53hvhUL5stH5JbcGy69T9ZaiUuiMU2waQDUoE9 UbSmua/qNLMEbYUaeAcMV27MkySEImPD44C3BJP1kbDRMtNE4WqiCvnTJXRweg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH630Z2zKFP; Tue, 23 Jan 2024 06:44: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 40N6i2ji056613; Tue, 23 Jan 2024 06:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i2LT056610; Tue, 23 Jan 2024 06:44:02 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:02 GMT Message-Id: <202401230644.40N6i2LT056610@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: 788c5cebec16 - stable/14 - vmware: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 788c5cebec16910aa2659b4d91970e362498f17e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=788c5cebec16910aa2659b4d91970e362498f17e commit 788c5cebec16910aa2659b4d91970e362498f17e Author: Gordon Bergling AuthorDate: 2024-01-20 16:33:27 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:41:49 +0000 vmware: Fix a typo in a source code comment - s/withing/within/ (cherry picked from commit 623848af604116aa33bc8a66d2ac45b4cbaccfd8) --- sys/dev/vmware/vmci/vmci_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vmware/vmci/vmci_defs.h b/sys/dev/vmware/vmci/vmci_defs.h index cfa302ad11aa..466712c41cee 100644 --- a/sys/dev/vmware/vmci/vmci_defs.h +++ b/sys/dev/vmware/vmci/vmci_defs.h @@ -259,7 +259,7 @@ static const struct vmci_handle VMCI_INVALID_HANDLE = {VMCI_INVALID_ID, #define VMCI_ERROR_QUEUEPAIR_NOT_READY (-40) #define VMCI_ERROR_WOULD_BLOCK (-41) -/* VMCI clients should return error code withing this range */ +/* VMCI clients should return error code within this range */ #define VMCI_ERROR_CLIENT_MIN (-500) #define VMCI_ERROR_CLIENT_MAX (-550) From nobody Tue Jan 23 06:44:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH76x0Dz57P2W; Tue, 23 Jan 2024 06:44: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 4TJyH74yTBz4Yhp; Tue, 23 Jan 2024 06:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBao0SPE2KsVKQ1Fsg8zAzYPPO/OeKuJPjHL9L1ZKfY=; b=JtnIEOMfq2cCREaMXt1/l9E9XYkpyxoM7E7jf3OVBLkJ+ZxF/Q+ffTsHzWCAlMhEVcJexX 6t9FBAqb66Rpe9o61uFLos3NB3bWqpnGb8oVeY2a8dyxbmivoRzGTEH/WEnRRB6nAEJoYd KEsVwfjOfjnR7iqlKt8PaCnjAYfCw6mGNbzeTSmwKbjGAGHhQsGPbTzUrV3qzbc++TU7fC +1vP1L7lt9aW7u6hxmFnYOoKTtLzUtjU4Kyyd8LVnfZUYQZ6lOj2LsQK2P0XpCuN5/yiJm 0C5UPzIDoHgRnLCDeDR+iXZF2Hsr+xIEeeSvv7t7fD/yJ5UtetwWyg8S2dK07Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBao0SPE2KsVKQ1Fsg8zAzYPPO/OeKuJPjHL9L1ZKfY=; b=AcQKjQDZN4ulrG356xqHxDplggIYiFkUkTBmB7TVLiVzIFO1EGZwuW8ZNsK5OPh12gYvso KJ9MmyflGZJqA4CXFDoh0AJ7NpLDK/eOZZUPOacoWTPJwzNMlqF0pAnEasvUnuS8AbHUDe urLT8NyK+KCd+oApXCZdWGXagz7Lo/JT8uw5mOdDZw50lhL2PsSt7hX6CKFvMKzITj/9A3 357ejvamAWPUTK/xJNuapwpDGa5sNAqGkx8LcgslSu7QZY5v98sb3w0LH+QDiErnmsZuDS PvGTTvmEEp1qLXi0xTBD60klftV/olL58ag7gWNXlZ7jf7cret8LZ40m+thSkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992243; a=rsa-sha256; cv=none; b=tnGZHrXdJDD0+VRha6gujT+1x/RM8+lvUtYi5QGs+C6IBNTaYJmM838+IQCXBpkfpCmIaq 8RzGCabM43CMxphZUbqx0l75kM69+yuuvFW+A26Mk2OHZhWvgTUIl0HgZh39GfTLqtH848 Ekd159os2lti4g3GbznVOjYr+kWGQMTukMwGzgZoJgfrsl6fPbQnKBNa+6LG/0LWdffczY Ssw2xppANlYwtvGqfdW28p5WlF5W2ZcHVr53x8o21d7/lRgdezP0ackuBQTKVbXb7PqA6d kPft9L1eiNEiJwrXyX3xyi6XZmcGe9ZvGAzJnZsHRTpfAgSnYS5LGS/AjfQTTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH7449RzKVD; Tue, 23 Jan 2024 06:44: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 40N6i3MA056667; Tue, 23 Jan 2024 06:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i37w056664; Tue, 23 Jan 2024 06:44:03 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:03 GMT Message-Id: <202401230644.40N6i37w056664@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: 4aed20f6377e - stable/14 - usb: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 4aed20f6377e6ed1f4f881930d5a28102ac5be3c Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4aed20f6377e6ed1f4f881930d5a28102ac5be3c commit 4aed20f6377e6ed1f4f881930d5a28102ac5be3c Author: Gordon Bergling AuthorDate: 2024-01-20 16:32:20 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:42:03 +0000 usb: Fix two typos in source code comments - s/bascially/basically/ - s/assistence/assistance/ (cherry picked from commit f5e3329a5a480aa1b2904106b2fdfd999439455b) --- sys/dev/usb/misc/udbp.h | 2 +- sys/dev/usb/serial/uftdi_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/misc/udbp.h b/sys/dev/usb/misc/udbp.h index eb2c27d5f9ef..a12cc739ef80 100644 --- a/sys/dev/usb/misc/udbp.h +++ b/sys/dev/usb/misc/udbp.h @@ -63,7 +63,7 @@ struct ngudbpstat { /* * This is used to define the 'parse type' for a struct ngudbpstat, which - * is bascially a description of how to convert a binary struct ngudbpstat + * is basically a description of how to convert a binary struct ngudbpstat * to an ASCII string and back. See ng_parse.h for more info. * * This needs to be kept in sync with the above structure definition diff --git a/sys/dev/usb/serial/uftdi_reg.h b/sys/dev/usb/serial/uftdi_reg.h index 80936f80b6fa..19794413cf2f 100644 --- a/sys/dev/usb/serial/uftdi_reg.h +++ b/sys/dev/usb/serial/uftdi_reg.h @@ -8,7 +8,7 @@ * USB on the other. * * Thanx to FTDI (http://www.ftdi.co.uk) for so kindly providing details - * of the protocol required to talk to the device and ongoing assistence + * of the protocol required to talk to the device and ongoing assistance * during development. * * Bill Ryder - bryder@sgi.com of Silicon Graphics, Inc. is the original From nobody Tue Jan 23 06:44:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyH91zrPz57P2X; Tue, 23 Jan 2024 06:44: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 4TJyH8622sz4YWh; Tue, 23 Jan 2024 06:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBADU383KqDnGD78hGPXjkH5WdujNplH+84fWof48k4=; b=aZuV28mXre6nH+JMckXEx+0qjilzbhb8wbLSlvDlouXZCWNN2f41WXjoenLq7/KXx+izje tJSulBd1kQ16CZ5zfuJFVjaa8DUZ9Aj9iNUVsyBh2n0mEgY9bqLDr52wZt41gdvCkBPFbq 5Q9WmyOyjSgbi6EleL19G5o1q5hn1TXCvAUjltFodoo5i0FAh4W9rgeCcvgSS6zA2ljDSg daI+tklecHOST0tIDaBMeCxf0HxLSMR1uVIFfDJj5QQeJV7jhc4n2K7mdHEUhDs7pFwhKH YJEhiR7VUZf7K+SBftswljdzPlyg1a2GGcxpnnULudwjyzyal3DzYoYJbAyXWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBADU383KqDnGD78hGPXjkH5WdujNplH+84fWof48k4=; b=QYrvhJp+g35Sf/Gj5bWEtEmfox+LwmlY9RbcKAXaj/JIrH/R/DFJIPlDJz48CAnB4Jccl/ V+OJNUsKoFZyPAdzL6jnOnA7W9tyGKnbvXOPr93+fJDp3Dsb2Ie6WBwmYvAFserG/6dlUE Kmx1baFFtEeZkACMd0NyBqL347N6TilUSoEgvQW38KM0bl8xGZ92L3xRavkQNtbpaXXhXv cMJHIFa02SYawgJsYRylmDm4WhgE3Bg47+KM6q6eKZnMLIfkjtSDxWU25w0Ayp2bLL6QYf 6J08Ye3qExXTO1/AhOaBBDqn7X+A6v8AQ1Otve4do3hPXX/XramIRroNKklHLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992244; a=rsa-sha256; cv=none; b=O5/3XUJFyBzVEM08MCJ+p2MHTcYWMyEQfJsrwKEF6Yp4YrUcZcMdPUTlbdVaM2aYarZWR8 oUwOqfypU8yip1iSg2dIoT9JIhM8KDEBQZL+J6KIn9sIISl3k9R4bWCx9nqbzeGNG4QZ51 /oGgc2mvWvTssgMgRvywqyUVnL1OZhJx0qMdHJyqk03XtjzigSycVp1qfn708winUe5skD dSDb2TtjuapXX4+JDGEeC/eZyzAKLCaknQwz0lFwf921VoPS8P6ude2ux04y1VvmNvL5A8 dRwQx4mQDm0NvCRU2AuyqcZ5M/qx9tVrX7Wdnf72lqwgQ7v2v05PRb52OYQzhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH858BgzKWD; Tue, 23 Jan 2024 06:44: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 40N6i4NE056722; Tue, 23 Jan 2024 06:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i4WL056719; Tue, 23 Jan 2024 06:44:04 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:04 GMT Message-Id: <202401230644.40N6i4WL056719@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: ae09f54c06f1 - stable/14 - ciss(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: ae09f54c06f17feb594ace1a5852f39490270427 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ae09f54c06f17feb594ace1a5852f39490270427 commit ae09f54c06f17feb594ace1a5852f39490270427 Author: Gordon Bergling AuthorDate: 2024-01-20 16:34:25 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:42:18 +0000 ciss(4): Fix a typo in a source code comment - s/strucutre/structure/ (cherry picked from commit ced92d000a9435745ca2891734e6e37ab1c5e873) --- sys/dev/ciss/cissreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h index b9dc10fbf478..5fc06410eee8 100644 --- a/sys/dev/ciss/cissreg.h +++ b/sys/dev/ciss/cissreg.h @@ -691,7 +691,7 @@ struct ciss_bmic_id_table { /* * Below here I have no documentation on the rest of this data structure. It is * inferred from the opensource cciss_vol_status application. I assume that this - * data strucutre is 512 bytes in total size, do not exceed it. + * data structure is 512 bytes in total size, do not exceed it. */ u_int8_t bDdffVersion[4]; /* DDFF update engine version */ u_int16_t usMaxLogicalUnits; /* Maximum logical units supported */ From nobody Tue Jan 23 06:44:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHB2h0rz57NpS; Tue, 23 Jan 2024 06:44: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 4TJyHB002Cz4YZW; Tue, 23 Jan 2024 06:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWw+2NUac+Z9byl5l1MDk14o6J2q25KroK1lcP19Ff8=; b=woEEmQuJjn454WwdQe9kLtS0fJYKcqfKBwa6lGsVOnzY46v9aBtjDwEEtBQ8fkT9i2dUjx Vh+RqadeluKdrZpbWBuh01k4SD6nipWAf/MmV6XJd9fTGhypUe4ynjG5RVDHZ8Li8jKtI2 Kq2R06Z+qYbt+Lsa/7JNfTdUICF5tlRvzn2XIiicOj2xrFlsMeYSutCrqF5+YtxWL1Hi5O ZPx8Ehdux/c/IsbbvWK9CAXP99y29p7GW2InYSr938NkZZMB9DjmH/BnD/NWOBOdnQ1TSh 2AYrsbDHF+xSxyNCgbk589i8010rHD2vXzx9ji3qbiDA8yfZSmXqZFu4nKencg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWw+2NUac+Z9byl5l1MDk14o6J2q25KroK1lcP19Ff8=; b=HSYhnA/ekARKVHHEtcxCnAxTg2cl8si0BItqbvpoJ3xzwaQb5bCQ4NegBHSV1X03gqrMa3 +XSv2HbAyUzBXAguT4ijm3mE28eXO4Kju0OQ0pZsglCzTMEkd1Up05iDr4r815t9neZWAu S5jiTg2cxqme4+8ekkphf7rUbwe5OqTOzjmeZh1q7hSnk5oFUaewMhxTcNKBpqLql3WvsJ OK9FkB0FGjuCFkbWkPPahFmy1vW2MFFCiu7+gRAymX7XPZyEljxXG/5kPkKXJxiNc/yDUk LanBnJQW22VW5kfcPgj5Ak0tVIXkNqv7iOgHmIj7y3H2+xfgCX72zM12R3axYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992246; a=rsa-sha256; cv=none; b=QHvIxlh9SWMp0GUKwbNVFaFJHFUKTAnQxzo6PvIwSYsm2opub4c05eKwJDJXf8gHpCXOaZ 3RAUBjXCcC4cz5PxBEosXI4AAu9UFFdMXDeljYd1UfQH7WtKl10xKgrV0ij3nyShDJn41T x4GzXD6SrJcKh3AAzBwCSQB/9IXiu1L1W8SxlbXa6815+kRHxN+fd95b0cwsw53iHBPlUp LcrMjx23Tj/0f9kl7q3yOAhkd09RhknrxxF1tXfz0nivBJVfvQYiSIBR25rbKwPulyMBuC KM0XH7vqoG463q+BtbKqtg9Awez64H03y6bopgJDvyDiSLFLIE33ECgDpFuFfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyH96CTgzKWF; Tue, 23 Jan 2024 06:44: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 40N6i5Cv056786; Tue, 23 Jan 2024 06:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i5RR056783; Tue, 23 Jan 2024 06:44:05 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:05 GMT Message-Id: <202401230644.40N6i5RR056783@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: 49e450f43d40 - stable/14 - tcp_hpts: Fix a typo of a function name in a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 49e450f43d401d886787fedfb066216fbebac68b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=49e450f43d401d886787fedfb066216fbebac68b commit 49e450f43d401d886787fedfb066216fbebac68b Author: Gordon Bergling AuthorDate: 2024-01-20 16:29:28 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:42:31 +0000 tcp_hpts: Fix a typo of a function name in a comment - s/tcp_ouput/tcp_output/ (cherry picked from commit ef0ac0a1ad6750291b881203030384b7f7241efb) --- sys/netinet/tcp_hpts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 73e9997c060f..9d192b17c41a 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -47,7 +47,7 @@ * * tcp_hpts_insert(tp, HPTS_USEC_TO_SLOTS(550)); * - * The above would schedule tcp_ouput() to be called in 550 useconds. + * The above would schedule tcp_output() to be called in 550 useconds. * Note that if using this mechanism the stack will want to add near * its top a check to prevent unwanted calls (from user land or the * arrival of incoming ack's). So it would add something like: From nobody Tue Jan 23 06:44:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHC3NH5z57Nlw; Tue, 23 Jan 2024 06:44: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 4TJyHC1H7sz4Yd8; Tue, 23 Jan 2024 06:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ijYmwLJYDyn0lg9gD4KkGqQys3Nyq7PBWR68NmQ11c=; b=k+fXaOznYqjLIQr8kjdY+gSWtlgykqbrG0l8Pp/S9BD8tBVmrUJT0s+tzqxyly8k8oyPQ+ woFb6uW9fb1GyD0QQvAVDNxiFrG+6IIHEHxXkPpe7jsZpkRm5OAk//DHA4Jh1vN908cIZ7 1kcJYxKfqYo+vC7FRsENJSI/EahcqXLEsyghiRgt99/T8OtPCLkb597qzXCh3u4/B7n33G Ys64LM/UdbwcllUOrfKkJ+vNGpyPfqzX7GJJdSnNXP6W8ZAcPKHwq5cafEdYxk/gQ9CqCN P8GkV5YM89+bCz5sJ8tQmm4SYyQl7RXcDP3N6q91ohu+HQWOMyL6Q1TW6cXUPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ijYmwLJYDyn0lg9gD4KkGqQys3Nyq7PBWR68NmQ11c=; b=Iv6HpnXYAYIBGKVgWGKItTZ//ClUnrEHD4zuPs5IejDcSs70Ft9ijOT1lpP3syoyVpdwvZ IOqdulLo49jgdxcGZ0wZgHBD2y++diE1HJSn/kLi5m/aRbFbDGpYYSN+Somjm3O5GwdKeS F+BXfMHPL5hABOt/3ZXJ1LtS0mhIXaXU7KmP/0PEixPbibeKofxN9orYc1OdwoyiNMmRa9 TayY1jl/J39tQdYRLIRV+IYG1B/+A5F9V42vqGWDjRclL3GE0j/Ccl/HSQaxB8+K0OUwJg W2ocEpgktrbfanBpS0d9jx5H18YYoHMUxxtG1fdyYFcBl3TXYx4r0orQUg3tmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992247; a=rsa-sha256; cv=none; b=RIUglvMmzAC4uFTsmd0puvIJYTYONftTgSn6ZOawkHKTwDGi20nmbjVYW+KLYEQdrzT7gG 6hqs34Jxt/2QqHQ/iCVXROOoUcuAJP2GjKe3/UcyOheaXJ9EOeP/RLGN/2kxtc+hQXYRCW jAw1FtOLri5zqTKcH6IV3cn+8s8pKMxY6kQ3Q87J04d02TRBEWS0je8hhmbd82kW+1pcrV xjHBiG8y8pQtgyytj6A57ePeEuIXgfKH7fqm6FfIb9MVUb805MmPU6yHcc8mlNaHsZEnPs rsRspDz20wKcw/IcrHFTXTomQLw4FF9M4xS6mlv5ZhoaP+RzdnLhFkTUT7qxqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyHC0NX1zKYZ; Tue, 23 Jan 2024 06:44:07 +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 40N6i6ZU056840; Tue, 23 Jan 2024 06:44:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i6YW056837; Tue, 23 Jan 2024 06:44:06 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:06 GMT Message-Id: <202401230644.40N6i6YW056837@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: 6e5c98c759b2 - stable/14 - PCI_IOV_INIT.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 6e5c98c759b2149d0cf82081c97e5d7f8056e270 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6e5c98c759b2149d0cf82081c97e5d7f8056e270 commit 6e5c98c759b2149d0cf82081c97e5d7f8056e270 Author: Gordon Bergling AuthorDate: 2024-01-20 19:20:32 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:42:47 +0000 PCI_IOV_INIT.9: Fix a typo in the manual page - s/infrastucture/infrastructure/ (cherry picked from commit bce295fcbe533d46d2f600168403c7968599b86b) --- share/man/man9/PCI_IOV_INIT.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/PCI_IOV_INIT.9 b/share/man/man9/PCI_IOV_INIT.9 index 3e71a65e4132..66b1e693cedb 100644 --- a/share/man/man9/PCI_IOV_INIT.9 +++ b/share/man/man9/PCI_IOV_INIT.9 @@ -40,7 +40,7 @@ The .Fn PCI_IOV_INIT method is called by the PCI Single-Root I/O Virtualization (SR-IOV) -infrastucture when the user requests that SR-IOV be enabled on a Physical +infrastructure when the user requests that SR-IOV be enabled on a Physical Function (PF). The number of Virtual Functions (VFs) that will be created is passed to this method in the From nobody Tue Jan 23 06:44:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHD3fmcz57P2n; Tue, 23 Jan 2024 06:44: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 4TJyHD2RjXz4Ypv; Tue, 23 Jan 2024 06:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x+EPmvFi4IpsOb6RAHuLrMR6G4kmNwY4WWXRRb5YoVo=; b=hGU19WTBGJUVHRYyUoA8++1Mat9h4gpDrKJMvD0N1zL0XwNe0pslSmv6VNadXUptWO8QGN nYg3WF7iMYoOzpSxuHYNkl4WPwY8aMRmC8Ih0IGcKkoacZS6Hkfq9zcH1DRZmXS3N63GQL hOtMDzv5QWhBPB2ooRFJoQ6ttc1yHhcvuMGHef+bIInlR3QRtUe9NpALLIFx/8tzFobU0W SEkruxs9vo+0eoVn5/Qsr4XXpPUo9N1EETEO2K9BH7Z0IwA97ftf1jihFF5XYFqbZ6x8BY 4RJcfYCdoX+OTO7Q/NSo8UL+S5qFbIbh20vKxYyq1z+sCmOKuHtysOgJmcFn5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x+EPmvFi4IpsOb6RAHuLrMR6G4kmNwY4WWXRRb5YoVo=; b=Ro7RpBoif1ZAXMvozrGCXIwhZRkSXfjB02tPU+iQEv5n74Qxdloo/tl7tml3f2DArJnv03 GAnelWGIjWfAN9xXuH4C2RoyfKNxoCZpyBqTzLmQ/yT/lf5ZP19Wk0+J5dUu3NLri8uAFx 190V2ZzwhxZok+BTtROr1LNi2AbjFTR0+Qh+TdBH19IPjdZLQ2l+H1ayVHnHw6KjyDIK9o VWbNmKtWHZPzxPQtwna93jbUt4zIGsdoeD1LOrvRLWUNzyhU3ta/Rve8Kwt7MJYYlr4kWQ v6Xf9lbRPi/41Y3H796WErmPUXJkwR8+W4XR+sRUt4VSjg+SIwvj9a8HbJuStQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992248; a=rsa-sha256; cv=none; b=hMgtWNve/GXM7oh+aBmOD0nuirwNCPimpUEDitmRzliiCAe1XYz7rjChnFcaUJb0TDQzZj E229zffdbooT7L9/h2g/mq0ClWz/EShSJSG2HC6nF+mTduQmjm4bDf0AiiA/e9knESD1Z/ PAU0HCPJJjdNMrswJReBmATapiiysBRywGw70zSklqOvfct/4QIUsmizrRxLEQKrfxEqzB hGgSgkkuayKOW9vKOxbS0iiRTxEDgvAQT26bWwvFjQlE18YB6qrIe2BFBJo3unR5Nsa19P ek05zda4fSoaHpqXhQxxw4GzmYRsqJP9PsZ5Zrot20aTVLat5Lb2k3PuEcFauA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyHD1SpvzKVF; Tue, 23 Jan 2024 06:44: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 40N6i8gZ056895; Tue, 23 Jan 2024 06:44:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i83S056892; Tue, 23 Jan 2024 06:44:08 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:08 GMT Message-Id: <202401230644.40N6i83S056892@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: d0f5ac0a72b8 - stable/14 - devfs(5): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d0f5ac0a72b8055a4f6a3c5b014e408cbfdc46dc Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d0f5ac0a72b8055a4f6a3c5b014e408cbfdc46dc commit d0f5ac0a72b8055a4f6a3c5b014e408cbfdc46dc Author: Gordon Bergling AuthorDate: 2024-01-20 16:25:45 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:43:09 +0000 devfs(5): Fix a typo in a source code comment - s/interpeted/interpreted/ (cherry picked from commit 7cf293536ebacc92150be12e0be928500e670610) --- sys/fs/devfs/devfs_rule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index 66fc00dfcb39..37d24577792d 100644 --- a/sys/fs/devfs/devfs_rule.c +++ b/sys/fs/devfs/devfs_rule.c @@ -45,7 +45,7 @@ * * A note on "special" identifiers: Ruleset 0 is the NULL, or empty, * ruleset; it cannot be deleted or changed in any way. This may be - * assumed inside the code; e.g., a ruleset of 0 may be interpeted to + * assumed inside the code; e.g., a ruleset of 0 may be interpreted to * mean "no ruleset". The interpretation of rule 0 is * command-dependent, but in no case is there a real rule with number * 0. From nobody Tue Jan 23 06:44:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHF4dbgz57P8H; Tue, 23 Jan 2024 06:44: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 4TJyHF3Qndz4Ys0; Tue, 23 Jan 2024 06:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nkUrNYg6NGPzamJH28+QB8vhUM7dGctwNO4KQruumhU=; b=HXtL3ueEIHrZJwuM/xbogEEivgJJ2ZvXGO3a0uSYviv7eOte9Cc4Q3UgxVK5SBZ3HCHLcL QRPHetiheDmpfa4r4VxG5WQJ86IrvU1z4DuHwB7YtczjQNP1IGg7e3RYBpKil6aMJq7IDd jLCeOJ/MdJEOYQtxq9J+8W078sk+879h3fIQ5SRMlTQeonMmZQHqR++Wy60cl07zVyfA6c ppA7ZcrKwnOLFNwWy80N/hE5yQ22nOW1/TNw7/qPUQI6Ihd2g9hsZ7HP1gRkUXgnnxAqhM 2Mzt33qAxTNvs04ZR4w944STuiLOTAbQaM36kFrPDsbjTLdFidSBiSNSomFpBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nkUrNYg6NGPzamJH28+QB8vhUM7dGctwNO4KQruumhU=; b=moWUZCBMgxzfqcDrndi9MWjJS4fQzQq5R0xdeCmkS+XAdVSn6AOeXb/yyUtEIpL2aGoTpW e7lR5toT+ABladBFng5cGTx1B71Na+xij40Xn37NcdkoTskUdjckDWoTxNCHktf/LclOc9 japM1P1+BZ5c9vHlXulzfrBEhoJN7q9bjN2a7WRm1DbCxNcpNS2Vm+BQBKQDbfeySukTn4 KehoB4HhAlQZNp0jztPgRRQSomFOSHkMpjDq24a9dp8XmT7Z4WbshrzQHm58HTX4ICsrV8 G5+0TqD4TiNJLlKgvVfnqYa1QAMMNihoYuOhJCuVcLpvjuheP7pL9ItVHWjnOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992249; a=rsa-sha256; cv=none; b=FyqxpvPQzXPMjFfNrdZ2NqxjC3iGpvIbdxX/zcr7vf6hu1Injgs4t2br/em/e5bWZUYTT9 D5uoNKPumsEWgJvEU7fDoawhMjEk56fhFnRCZ3KhzQXkrc3r22jRh11ou7EjCR693mj/8o A9+JxRV+Ty5RBHHmjc96ut79iYSoGe+sYlZnT3+iZg00uF6g2PPpR8STxn8vCj78KjwRmF 5uQdqaJSJFjhGljcRPqb//inK2PudcMAhxhcYZJH18JxepelLCHymgSm5mc1qhEf4pzbvL 5YL2hwNJUKXnUYX+SpCo4rXg+1Wz9M2FkiC9S9G/4cntL3gOvdEW9ilF0hZHhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyHF2WmSzKVG; Tue, 23 Jan 2024 06:44: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 40N6i9fO056948; Tue, 23 Jan 2024 06:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6i9lm056945; Tue, 23 Jan 2024 06:44:09 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:09 GMT Message-Id: <202401230644.40N6i9lm056945@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: c75648dc9b84 - stable/14 - sigfastblock.2: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c75648dc9b84298271985b9f681135404d9a6a14 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c75648dc9b84298271985b9f681135404d9a6a14 commit c75648dc9b84298271985b9f681135404d9a6a14 Author: Gordon Bergling AuthorDate: 2024-01-20 18:54:33 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:43:27 +0000 sigfastblock.2: Fix a typo in the manual page - s/successfull/successful/ (cherry picked from commit a70008e95b907336bddbcc2aa9d567df6e3a41b6) --- lib/libc/sys/sigfastblock.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/sigfastblock.2 b/lib/libc/sys/sigfastblock.2 index 84ce6cd15090..72897191c4bc 100644 --- a/lib/libc/sys/sigfastblock.2 +++ b/lib/libc/sys/sigfastblock.2 @@ -129,7 +129,7 @@ The variable address passed to is not aligned naturally. The .Dv SIGFASTBLOCK_UNSETPTR -operation was attempted without prior successfull call to +operation was attempted without prior successful call to .Dv SIGFASTBLOCK_SETPTR . .It Bq Er EFAULT Attempt to read or write to the sigblock variable failed. From nobody Tue Jan 23 06:44:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyHG5dZdz57Nly; Tue, 23 Jan 2024 06:44: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 4TJyHG4VFQz4Z0S; Tue, 23 Jan 2024 06:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FRCAWJETIsmyadSvltPEoKfG/aUgppCit8sD7Kt0O4Q=; b=JhupGb6+WHJgVm+P6WkYWBr7LCrWNCRFTnsWqgdY7vIgUcfuHK4sKzBSK76JT38n9+4yzT w1L6rijZ06WxeW5Zhk+Vm9iIcNOk4PpoQZKnyb/nd+I0ptzLKgUlMzR7m3tl/dd1VwxW6j 3GfkCZtcBu5SdT2Bdxal3+ezSyv3U0PXaprMuvdqF61xtDu/OU8uU5avaJQFrA5hqV+kAx yMLMAVyMGW4BmG1WcVtyOsAjFZk9lx7LpF0nmsHokrramr15kKVfs7VK0IJOrB4tfblSw5 qIPcAa3po1eo258veRM74fcQM9S4F+dRpbMYIIjBYjoPJKmiv76PjhCUKooQIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FRCAWJETIsmyadSvltPEoKfG/aUgppCit8sD7Kt0O4Q=; b=BUTYgOe1zzZkbp19NOdEXW0Vq8K/Xzy+vxJWXU97BEHFZmtAspoRj8wbJDMq5RB8VY7o+o qnmUJ1K4vwKKNgdXmUhErZA27LCy/RTkl633UNsGxp4fXlHfTgtIrlEab3IJjbp289BnAC qKrJ3yCIPIt9Nf7sfo9bLZ6m0nmrv1le334ZNebtOynmSGhjRiYd1y2w+A3DSh7prR3CIa ta5mmYFMe08P/9vb2iUYU67C3BXiKJRhOudqKWVEuElC7lzZJphHdBK7EsCY0+ECryh5E0 DaRLevg++aXWd5GdRjpENKVQi2VqfU8xPvcQESazzQU2gpY3lN5QxPX8QThbdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992250; a=rsa-sha256; cv=none; b=JZY7HLAQ30s6K2zaiM2gxpOv+K3cFX6Ge9mERynUlXlNiCqVSPXgmcjiz0M3/1kEI9fqoa Af112LK2kRRbA+dibStREtdi0ol+tLRNRT5iWkadjxGaWWSKL5IVZOtqVhPOXfb0Y8ZKIv G5oKaCBwNwzAqCaaJIJezVeuBfjXos0TJawf5Hu3DZXk1YY0KiimQwpOEMM6hNS+sz62wl nGvmh+fu/3Q8Z9hv90onAYI7NgTEt5whi8NJe2+i7z+seZHFerxIYpGbeg5ZKKzByvCw5l hX55DUKdBe+xsYcRzlOhTZxw0czGJMd4ZCDG+r7FgKSFOpozUBbBdscWgwe0EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyHG3bKpzKBF; Tue, 23 Jan 2024 06:44: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 40N6iAho056999; Tue, 23 Jan 2024 06:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6iA8G056996; Tue, 23 Jan 2024 06:44:10 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:44:10 GMT Message-Id: <202401230644.40N6iA8G056996@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: 7c44565e23a8 - stable/14 - pkru.3: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 7c44565e23a8315cc8be0218b4f7d632411cf688 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7c44565e23a8315cc8be0218b4f7d632411cf688 commit 7c44565e23a8315cc8be0218b4f7d632411cf688 Author: Gordon Bergling AuthorDate: 2024-01-20 18:55:08 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:43:42 +0000 pkru.3: Fix a typo in the manual page - s/successfull/successful/ (cherry picked from commit 8593b5b2addf91987f81ebac0d8b2e51207e4793) --- lib/libc/x86/sys/pkru.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/x86/sys/pkru.3 b/lib/libc/x86/sys/pkru.3 index 1785f93cf4b6..2bcb6a64baaa 100644 --- a/lib/libc/x86/sys/pkru.3 +++ b/lib/libc/x86/sys/pkru.3 @@ -106,7 +106,7 @@ and having length .Fa len . Starting address is truncated to the page start, and the end is rounded up to the end of the page. -After a successfull call, the range has the specified key assigned, +After a successful call, the range has the specified key assigned, even if the key is zero and it did not change the page table entries. .Pp The From nobody Tue Jan 23 06:48:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMk0xC0z57PXM; Tue, 23 Jan 2024 06:48: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 4TJyMk0MPzz4ctG; Tue, 23 Jan 2024 06:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpEf3wtwTPBKMZ17c/7a+LcFaQzomEjDeZ//Tk8ByB8=; b=Lb5XM78zfXOCYGOCQZbTc+8TaMLGoClcb1uq4uuPPmwqG2HsauRn6YF+cTr5K7svfmcntf q2F2N0Hqax3T5CkGvOGsZdG/uToYK/Qj3KQ1bx8iHYzxhKcML1/5sdMtprcAPnE2me0t1M xLRK9b8K02q/jg7xUrBgesUY/KOESGDs4+L/pnpqHrERQfLAIy6OtK2wIdovVAyECcZvbx rL3eEwg63CLtba+6w6zlmjflLU4GKVNqDfTLWsQhicLtkpoc2NAufNS9cRh0NQzkAFXeuD JV2xQt9twcUNpfFuQCOCGjBwzbMQ5LloGOw2OB7WRB9nuT57kdeHC4BxTtceXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SpEf3wtwTPBKMZ17c/7a+LcFaQzomEjDeZ//Tk8ByB8=; b=dlhb5U+Ya/wvLT0H8pZeVLnBJ7uABetWzVP3SluDC4rjNz9QWnN13noPk6MhRoadrSZw04 m44PRWnxEd0TXQNCbyTBLILc+4h/pECIEgZkyUqDrm2vPnmayf4zJJlYDpofaUeGjpXO4Z IrTRnVftrQGM8Px3Er1t043lVlqsnES/h3cFn1T1ol0yFve6BmhHcWnXr5U0q98surQrm7 36IS5lOsLS3u0B+sjBRaXt0PRrJclc5QcSY2wnmCkKNOv6BmgIQMgGL6gZDVa2/kKDFyvG /Z8EwQacCTso2yMFfKvB33wZTlMZ3eqKVGxl/HGX8otgU13aTuw7ph36jEodfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992482; a=rsa-sha256; cv=none; b=tmKX1yRFvXmuV9VC/Q1xyl0th6El94Wbp/X9EcNSsuqMBPRtBhcV2dHoI9T3ei4WF6eNuH Fmiq4F5vDIyDJ3xwSRFSha2WxymlFkLCHOxq8s54u3EO829/N8oa0+iy6uC22VILvhY5tI YNqzXKjyb4426guNaUuxkIlvYM/AwDBi0CIsUfLnPpaW2WYINkc7+hlKj3Gs9bS3CvEiCj hzFpDaGpth7lm/7spn+OjLi5awg9yt3mgTzirCub3EyciU6PnG8Dfw2q8iY1g85/IKKiZ1 XWeMXIvq4KeTtGjYNekcb0Y4+k0CMY7pf54TH+/WxqWJw1EjdwhPwnREs1lfsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMj6XrbzKYh; Tue, 23 Jan 2024 06:48: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 40N6m1vf057746; Tue, 23 Jan 2024 06:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m1lh057743; Tue, 23 Jan 2024 06:48:01 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:01 GMT Message-Id: <202401230648.40N6m1lh057743@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: ae6531f52f83 - stable/13 - pkru.3: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: ae6531f52f8387bbcfa8014298db3472bc5348a9 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ae6531f52f8387bbcfa8014298db3472bc5348a9 commit ae6531f52f8387bbcfa8014298db3472bc5348a9 Author: Gordon Bergling AuthorDate: 2024-01-20 18:55:08 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:45:32 +0000 pkru.3: Fix a typo in the manual page - s/successfull/successful/ (cherry picked from commit 8593b5b2addf91987f81ebac0d8b2e51207e4793) --- lib/libc/x86/sys/pkru.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/x86/sys/pkru.3 b/lib/libc/x86/sys/pkru.3 index 1785f93cf4b6..2bcb6a64baaa 100644 --- a/lib/libc/x86/sys/pkru.3 +++ b/lib/libc/x86/sys/pkru.3 @@ -106,7 +106,7 @@ and having length .Fa len . Starting address is truncated to the page start, and the end is rounded up to the end of the page. -After a successfull call, the range has the specified key assigned, +After a successful call, the range has the specified key assigned, even if the key is zero and it did not change the page table entries. .Pp The From nobody Tue Jan 23 06:48:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMl1rjtz57PRs; Tue, 23 Jan 2024 06:48: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 4TJyMl1KHhz4cng; Tue, 23 Jan 2024 06:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5AyWZV7yLNXHH9SQL2IG+3MGzFZ5+e8drhfsaCXcZSg=; b=naKprgCOdCSd77YJ7SV6N0TStMLwdsezG9nvUAds125pGXkcGxHUDS82VoX+geV82/Jauf lYil89aoRr4fP9EpXSZ8j9FQWH5fgKe/CpyoG9EHJMc7+YOWHlJsgnvq5uojipuQNEb1oG f10+qIemBwv+2TU3Y4v4jcnGs7L9olIQ+Wqbnag9XGqIMh6BApySpJldKBgoCRbzoq/y9k EfHyOb4HortSNS5G5wTdYl9/jXBb/Yahss8tiRFz3t8Cp7t/eCp/cUdBpoX1g159yHZpYb Kl586kmLuoU1HELgcJ1Umhw0WrOymVLwPqiSdisfpZz0ewcailsk2sNEoCmxjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5AyWZV7yLNXHH9SQL2IG+3MGzFZ5+e8drhfsaCXcZSg=; b=BlBaUrkHpbOOPuipmicJXB+iX6FIVD9nt6YDSEXxLWHNpambt/HIkqqrDkKZ2Q8FvkYP60 In79WZnYfOVNB2mbcu9w7sSCW8EMvsuszrbrn3gFKdhCyr6gOBQStTCtuic2vkd0f2RSLK HKSbG09+0GFiNBb6a8G94hSkST5YzKQfp6Nvq/RCmD2ltFtHn+gqIzqFx3COR1RTpLhTdh FXQW51Pnzhgto6GoZLLM3KXNw2enRRVszG0LBPKKOHksuK9/7zesN7uOeAFu2icau16eLM BiI7J5m9U2QyWK0BOU2PAm2b04azT3KgHIm2+vc3nSurbZy1PLmcToE/I9BrCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992483; a=rsa-sha256; cv=none; b=hhzBtvDIrMPMEPthAN1ZHGhM39Y/L72mAv9N4bBe4xGOGeLfUy5XjonHODRVGe8EYea/Fw rjqlUAO726olvYyVukXJQ0Tpt45U9h7dc84ODy/wtdI7U3V7q7u32G3kwSUJHSc6y3w7WT WC63IaDnzi2B2OjH7PWD568dzc9WytBVk8N2LD7L3J+yy1gYbFhTysGe7M6kuTpI2bfyKP plo4cMPWXR0Dz21abknljNZ9pQ1BRajHglAtAkj9Tkm8KIHyuXChNjfRdEwwa1d0JYH6e9 GcSuod/KvuW9+TAqhHEeO49KHs0A4Q2iPfoUde78+NymL5DUbKXbWK+mlDZ/Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMl0PjNzKYj; Tue, 23 Jan 2024 06:48: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 40N6m2gL057797; Tue, 23 Jan 2024 06:48:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m2LZ057794; Tue, 23 Jan 2024 06:48:02 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:02 GMT Message-Id: <202401230648.40N6m2LZ057794@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: 4bd2aee6120e - stable/13 - sigfastblock.2: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 4bd2aee6120edb8979bb57211a06f06406ad6407 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4bd2aee6120edb8979bb57211a06f06406ad6407 commit 4bd2aee6120edb8979bb57211a06f06406ad6407 Author: Gordon Bergling AuthorDate: 2024-01-20 18:54:33 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:45:41 +0000 sigfastblock.2: Fix a typo in the manual page - s/successfull/successful/ (cherry picked from commit a70008e95b907336bddbcc2aa9d567df6e3a41b6) --- lib/libc/sys/sigfastblock.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/sigfastblock.2 b/lib/libc/sys/sigfastblock.2 index 84ce6cd15090..72897191c4bc 100644 --- a/lib/libc/sys/sigfastblock.2 +++ b/lib/libc/sys/sigfastblock.2 @@ -129,7 +129,7 @@ The variable address passed to is not aligned naturally. The .Dv SIGFASTBLOCK_UNSETPTR -operation was attempted without prior successfull call to +operation was attempted without prior successful call to .Dv SIGFASTBLOCK_SETPTR . .It Bq Er EFAULT Attempt to read or write to the sigblock variable failed. From nobody Tue Jan 23 06:48:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMm3ZRLz57PK5; Tue, 23 Jan 2024 06:48: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 4TJyMm27g8z4crK; Tue, 23 Jan 2024 06:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/jnsu2kvdLkrlOVlbSP+ztxk0MiJz4f/jW73bBTjJG4=; b=GdDf4cTDzGq8zmhFL3ZTz64KUm+P+URekhZW15vcRwM4S/6ms/RinQQA4sfWerpJLQYadY H6317Zy7y/EVd722SvsMBiJ9PkTs53PA2kdb62QGkBgTyzcNZWpsKkTzbGzGy0SRJxyz+/ PniSCEyhjDJ4Ahme2umrIjd5emoNCfIBtbyTpz4AwWgoZR4L8iSQD/Qp+Vq8kvNLKX6MFZ Iqjl58XQd9H3AbRb2Jl6b8xuws2ZI4s1NKAs3+kqvJEg79yqKYcQsNWw1W/0wY6lN2Qwqt hWvAeK6N/o/p09O1K2ci15+wpgkddNceM1CYYTneGr8VLrYAP41cKuKRPPtJWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/jnsu2kvdLkrlOVlbSP+ztxk0MiJz4f/jW73bBTjJG4=; b=EzfYcWcrm7XmV3eOZDTSMecRStYJ0kr8dTULZ1aQ/uTvFgKcPqYUVNpRdBtqfz5e9T8MIX uFy86HBqZDsAKLKkKtH+8sxvJSvabPtJyssFh0pf7rTaD84wznJNR33FCHJmpcdFI8mKsT MkrWRc0skVfjDkCL3HjgVbRvHPmModa1RX4vdEoA9dKKfideX2pDad+bC+KQg4eCi3jqIb bXUSLp24VpKb5B5C4a8o7JxVrE5T3XxC5O4FlGcTSJVSqWi/RqkClQedVCQM6YdVQyiO9z JgaEkz/8MP6DKZXHje2Ney8uxcpedK1KpGPY7Sw0U3HhrPy+QTfIXnArgQd+/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992484; a=rsa-sha256; cv=none; b=QND8gmDaVr3aSYgTltQrEUiCIqpoQdNLdGjCVLOGvamvK79KMJhcTk3XdY4HLw0G/5+Ipz MyeqgSLGuPltOZRyaABFOXFjDs5PxVMHYscUFyyP7H/FjTGy1uo6Tx76UX8i3TJd7yPeO6 fdl3FVtMxHYOklro2xdvNCJKZQXYiboeSZn8glbmqg59UvYE9ZmvR91U4vpvY5rm5RLh5x I3vY4A8EFQ794WmDJguqYoz+gdQJipPcy7HXNpn/pZueYYrH6ByKsZUjaIK8fV/a7CYAvd /akBOBL0DtaMkwIq//HdzoIFIOM4wh8Jtmut8nkAxReCE8EqKt8zUJhzJRy8HA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMm1BfPzKVK; Tue, 23 Jan 2024 06:48: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 40N6m4kX057855; Tue, 23 Jan 2024 06:48:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m4WS057852; Tue, 23 Jan 2024 06:48:04 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:04 GMT Message-Id: <202401230648.40N6m4WS057852@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: a17275e29f89 - stable/13 - devfs(5): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a17275e29f89d2ceb197787095eb93042631a55b Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a17275e29f89d2ceb197787095eb93042631a55b commit a17275e29f89d2ceb197787095eb93042631a55b Author: Gordon Bergling AuthorDate: 2024-01-20 16:25:45 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:45:52 +0000 devfs(5): Fix a typo in a source code comment - s/interpeted/interpreted/ (cherry picked from commit 7cf293536ebacc92150be12e0be928500e670610) --- sys/fs/devfs/devfs_rule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index 66fc00dfcb39..37d24577792d 100644 --- a/sys/fs/devfs/devfs_rule.c +++ b/sys/fs/devfs/devfs_rule.c @@ -45,7 +45,7 @@ * * A note on "special" identifiers: Ruleset 0 is the NULL, or empty, * ruleset; it cannot be deleted or changed in any way. This may be - * assumed inside the code; e.g., a ruleset of 0 may be interpeted to + * assumed inside the code; e.g., a ruleset of 0 may be interpreted to * mean "no ruleset". The interpretation of rule 0 is * command-dependent, but in no case is there a real rule with number * 0. From nobody Tue Jan 23 06:48:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMn57qBz57PPL; Tue, 23 Jan 2024 06:48: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 4TJyMn3Nmdz4cx5; Tue, 23 Jan 2024 06:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t46spG/HyJLOm/3GsIaapEPE0xqNCtQ1ABgytSbQvzg=; b=m9qzxaON7u/PED6I4iWLyYARKtfGhMI06LfJ99Yw/JheCt6ysR8wF7uWNp5x/IPAx06gEn 59zBNqrgI6M1nbTxz/rHtz3hVs+YsztBl3gZbOX89xS+1xUeXLODhUJObPQLI/0hZNdNYT VMC8edFzLCZJCJA+tNfkn0S5wut7vgYS4Qi/BuSQMRmwg4kOWFnZPibD0WFUGO1w4P82m2 AX9g1xrTcEhYaT10K8ZjzGxUvdaGBl7qNyEaf7WcmyXSNtAHB6l/oovfx6Dag2ewOYsQ2g F+Y9rxeMG0cin7eT2XJw0KRd64Eca4gmwbAsduVUC5jwAhvqKT/jtUe0h0n7Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t46spG/HyJLOm/3GsIaapEPE0xqNCtQ1ABgytSbQvzg=; b=b/WXTEmjB00owM7yK7IJ9iO71mpyDqXk8zLyYxWrf3jPW/HuR10lUEfPbcEq6OjPweK+RM s5DsN+mTS93YVUUuPxeoIQp+tCDVKPBmeQ+P5yuAWN9Eq0gQBJdv3L1Q/0PZDcDJ3wZcav G9ca1AstGEAuauNjY8AS+0//9XB9Ou57DFrnLyto54w61FGpFneRuTe5QJ144S7Bm6ZpLc 68e3l8ttXGXKOUI9A4Q7ZPQECVxa6IqicsY2PzG2v1oR/wcvZYtqGsrDKB3ckFPUkTg+aj 27oTByXGL/3R+s4nKSDL6RfrrYLmqrulUo0giUg/uciARJvokeylgVsAayl7xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992485; a=rsa-sha256; cv=none; b=W999c3/zz8mMO3DM3jeS/CnmmvjvNUkDn2dc/QPB1GcJt7m+9iD+YLqEh/rF1gJPUGFSlM p1Z3WqDRVhvjSBFVpEbxP6uS6VZXNH5xRvU2y0eMSavQmMYlGUHrDECrI+Iv6n0NT/1IcO q5idgurCi69nwVu6ccFdMsRP0jbKSp4LaWl+ZHUgrZ4unQd2BJ3PGURDlStTRmw2zlokhA PvjQz0Iuw83HI/4aZiwluXcb5zZ5jsXH4ihiTLgAbSlIuPOCQTozvuVLK8hXeVkqTZniWc zzFDHQ9lNANJK1n2yOfXA8rL9TF48xGIiBBUKhRzX2n5nJrwb5jOp7ggrWjvKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMn2T1LzKFQ; Tue, 23 Jan 2024 06:48: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 40N6m59M057910; Tue, 23 Jan 2024 06:48:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m50h057907; Tue, 23 Jan 2024 06:48:05 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:05 GMT Message-Id: <202401230648.40N6m50h057907@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: d04d50c839d1 - stable/13 - PCI_IOV_INIT.9: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d04d50c839d1944bacfecca536d908adb05b916e Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d04d50c839d1944bacfecca536d908adb05b916e commit d04d50c839d1944bacfecca536d908adb05b916e Author: Gordon Bergling AuthorDate: 2024-01-20 19:20:32 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:03 +0000 PCI_IOV_INIT.9: Fix a typo in the manual page - s/infrastucture/infrastructure/ (cherry picked from commit bce295fcbe533d46d2f600168403c7968599b86b) --- share/man/man9/PCI_IOV_INIT.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/PCI_IOV_INIT.9 b/share/man/man9/PCI_IOV_INIT.9 index 3e71a65e4132..66b1e693cedb 100644 --- a/share/man/man9/PCI_IOV_INIT.9 +++ b/share/man/man9/PCI_IOV_INIT.9 @@ -40,7 +40,7 @@ The .Fn PCI_IOV_INIT method is called by the PCI Single-Root I/O Virtualization (SR-IOV) -infrastucture when the user requests that SR-IOV be enabled on a Physical +infrastructure when the user requests that SR-IOV be enabled on a Physical Function (PF). The number of Virtual Functions (VFs) that will be created is passed to this method in the From nobody Tue Jan 23 06:48:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMp6DJJz57PHJ; Tue, 23 Jan 2024 06:48: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 4TJyMp49tHz4d2n; Tue, 23 Jan 2024 06:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltfwmXbaN/cCCa9vJtLwHe+D649haiues2wIXsy341g=; b=cVaTe2sAxCDtsM5AA83WHd/kNg9yAHmMiSTuoaFqVAapwupltdOpNunHkzE2hI9LpaEg6x zhyNhz0Ryk5hT+dfyF5ZBUyFzryO2v9/BCZiG+moAuyca1IpwjRyyAIVSzn3m9BX5i4hmH zJJ9gzj1hxQb7zldt4THNvvU1+3Bax4S7MxQ0iA2AX1PnJgl5/Ve7ZT3t9gcuSppYYyDH0 Zbu8i9x6GC/XQRPZLKjVDrCp5nQz5yTC5/yXoCYCpcaBu7TWTFMp49CyOxsnOfr5gQaCeT eagMPN3Guv0LGMDYNIxxElDJEQpZ4F3o4U+AOM2rEHXVdfRe99Pr8H94Z2Y01g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltfwmXbaN/cCCa9vJtLwHe+D649haiues2wIXsy341g=; b=DCy/1UzgCGxMP0FiF1ZF4SXd2Fv7kc0VWv+nhcBqJiiCzv9hCu4TM27Un2mMsAuPNQvCVU /6+MrM2WrwZZu5l/+rvdFfozvySgqk7570Cj6YKW0hpjUjP/P5pucq4UxZbqiHxQJ64zeR HgzZO3oJUr9Tw8OEJSe3foZYSknxMeCm6gXQbKGP/WcIDdotXOj0o2+l/y/c5Qcex2heqM eJfob3fKMIZuG1VFfscugo8xlrc3GEmukgKBxWBZimaHDsoVqYilatWpwGge36nYX6p78S mV7PxiE7zAoITwVUCqCPqQiin+QcyZCMFwPngUfH23nYDXqnWfbEP3yek32dFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992486; a=rsa-sha256; cv=none; b=V5KKninyYs9f5Le6OHn0A/MyJplZ/4IjGxUVNpyb++Rui4ZHww9l4YBMxs0fwEBGKf+GLr hBm9c5bbLaJkPZHzAEYiCze6nhQUkgDSzHmYOfw7ExRYc+SwfZ4hLQuxciTLMDKPivqR8g pUMueyxCU/r/aHIRwQK7zL8numMdqzAIGKra5EdPBVPueN3aGDtvTdC8mXVhX6Rdzig1uF GFivSgtmSg3UmMQqFOHgYIcX9pjmcBW3p+A+k9jber1uc9ehJg0L/XmQSdZK3BB1LlU0WM Yn+58W8rzsRyjz6DOOkxEVah13kqQYFj84NagKtBE44NL2i2+rbJWkYC2Fb8bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMp30rCzKFR; Tue, 23 Jan 2024 06:48: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 40N6m6fC057972; Tue, 23 Jan 2024 06:48:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m6VP057969; Tue, 23 Jan 2024 06:48:06 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:06 GMT Message-Id: <202401230648.40N6m6VP057969@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: 95847cc26f79 - stable/13 - tcp_hpts: Fix a typo of a function name in a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 95847cc26f798beff413024e7daaab03f7eaacf9 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=95847cc26f798beff413024e7daaab03f7eaacf9 commit 95847cc26f798beff413024e7daaab03f7eaacf9 Author: Gordon Bergling AuthorDate: 2024-01-20 16:29:28 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:14 +0000 tcp_hpts: Fix a typo of a function name in a comment - s/tcp_ouput/tcp_output/ (cherry picked from commit ef0ac0a1ad6750291b881203030384b7f7241efb) --- sys/netinet/tcp_hpts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 5e59697b2bd7..18576e181b6f 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -48,7 +48,7 @@ * * tcp_hpts_insert(tp, HPTS_USEC_TO_SLOTS(550)); * - * The above would schedule tcp_ouput() to be called in 550 useconds. + * The above would schedule tcp_output() to be called in 550 useconds. * Note that if using this mechanism the stack will want to add near * its top a check to prevent unwanted calls (from user land or the * arrival of incoming ack's). So it would add something like: From nobody Tue Jan 23 06:48:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMr1149z57PPR; Tue, 23 Jan 2024 06:48: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 4TJyMq5C4Lz4cxX; Tue, 23 Jan 2024 06:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=euMuVYzfh9b4g11GZEcq+X1dG2ElATwzpN1R6v+ZCoU=; b=Y8pruSOcQoqt++yrOHFtr5qq3VmbnLMwTW1ZtTqq9n4qVqF+gbEUV2zwR8CCexdqHKLBkW CTo2219gygxv8KEGDp3kcjTXVRRMWhenFjfvHfbL48Iig3c9Wl567oANts8IVcZx9ZqKb6 b46nXXdI6FVsTsW1qf5CryjJ9vCn0dOT9nmfRAbQMjpXONgH2C7pSh7VLCTr8edOHBoK6I XYaCdqzsdjhn/Xm/xzJqESwyHRr0Aiu+35j2VLZzOq6kQVG7gphVKU9lC3hD/yWIOMHxZQ YxDijf5tHKWKD3yJ/Gl8xJarJvM0Ln8LD0Uk+3vwLbKjSkW+rh814x/J660r3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=euMuVYzfh9b4g11GZEcq+X1dG2ElATwzpN1R6v+ZCoU=; b=n1ehl1MULRp1Zs99CCwJTzutKLCnuIP109xPVYEH8hw6k60AHFyGeNt4EY/ACLHwGbW/Cy 74vOCxd7XCxtHcEu2DgAG7q+ZSDYBhuygjL7qstKStKp6rYap3FOcD4qQKHbkS3wYaXcZy H3SVjEY98nmElAbfGlEP1kAxEPB9MM5R44QOUBMVdq6Kajk+joWp8Ye/SyEenM97RjFXgh 2nMgwRcJynset6xipEamOPiOi9nqihyEqJ6yHvCoDhqyuiz9ab51D5TfN4mOLWz1nCyGs1 T13dTRg/DxK23Bb84KHvoP2+4VLCL22T2exyoXQxNRXAM9kjG5zn89YbYO+Izg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992487; a=rsa-sha256; cv=none; b=vtSXqYzTwhmXYsU4ruLcFpgsPuh74z6nR6Hv6ZXILhuGHLdRB0kzXpy6FC3k6fCIYvBHz+ 9Ns8guysTMXPfUefJ9YKECO9ShjurVrYJRG26jqVWlyZCP30b0LaovS8w+XOIHSEX+doE1 J9RZJlpWtfrkF2J24ZkAuVpxiQvpoIhsKl7f13tjQBfB2Pbpc2Oi6k2eAdlZT2K6If/a23 qFMJNAQSKhIzQwvTwSGFlunNx9NrmD4vm5o98gB7pVFn1XsrPxiskI6glyNjWpRkXVgqJ/ PGZTiQa6jwfzVHbIFNY8e4u730cKAzNuNPuGpvxJ1ybldSW1xNVWXr9NZdTSGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMq4HzvzKYk; Tue, 23 Jan 2024 06:48:07 +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 40N6m75f058026; Tue, 23 Jan 2024 06:48:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m7xF058023; Tue, 23 Jan 2024 06:48:07 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:07 GMT Message-Id: <202401230648.40N6m7xF058023@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: fd4ad6cd272f - stable/13 - ciss(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: fd4ad6cd272f851b9575d0e5419591e3bcf8e79e Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fd4ad6cd272f851b9575d0e5419591e3bcf8e79e commit fd4ad6cd272f851b9575d0e5419591e3bcf8e79e Author: Gordon Bergling AuthorDate: 2024-01-20 16:34:25 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:31 +0000 ciss(4): Fix a typo in a source code comment - s/strucutre/structure/ (cherry picked from commit ced92d000a9435745ca2891734e6e37ab1c5e873) --- sys/dev/ciss/cissreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h index b9dc10fbf478..5fc06410eee8 100644 --- a/sys/dev/ciss/cissreg.h +++ b/sys/dev/ciss/cissreg.h @@ -691,7 +691,7 @@ struct ciss_bmic_id_table { /* * Below here I have no documentation on the rest of this data structure. It is * inferred from the opensource cciss_vol_status application. I assume that this - * data strucutre is 512 bytes in total size, do not exceed it. + * data structure is 512 bytes in total size, do not exceed it. */ u_int8_t bDdffVersion[4]; /* DDFF update engine version */ u_int16_t usMaxLogicalUnits; /* Maximum logical units supported */ From nobody Tue Jan 23 06:48:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMs0pyrz57PLw; Tue, 23 Jan 2024 06:48: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 4TJyMr6GcCz4ck7; Tue, 23 Jan 2024 06:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6otujZ72+WFLISqfzVZLLM5C8SWKVZIQTh9ErXF0qE=; b=Fkwp4NOcgBF3v7T212/V4B/1/YaYHBGnErDagF16/GzlQxJNwWKYP7H9sG0B1BF5sjiiYA KabXGNyxu8Hnr7WgzCP7HssjI4cBrS5eZTd6K9qVoXTPlvsyzlUVdewkEzTc+Xvu/IJvN7 3onJ8Bb07QiMGJR1C5Xp/Vc70nmIij4foRMQ+wbBwqwxap+CY/3zIMcqbuvYd4b/puwNlb 9Wfc5O8Y+Wrz90umkJYc8LFSNv+iprrbrRuBneHAedXXrtNV2LGmIY2HtGBhAtLuXMre8v FpHC4tVdlFpj8rRnGaBB2Y1CnND7YUh2yITl4S3dG1fl0YgSwM5+6uYimLzZXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6otujZ72+WFLISqfzVZLLM5C8SWKVZIQTh9ErXF0qE=; b=sPjtvja7/Y+djTId7pdT0CguKxUfavl08kiTaTnynremWeZKtT7VPkFNiPxKjt34hpUSMA LQqM66BdhoInP10oOy1Pwscvay4tuX444bOI3Kpz+nGf/T65ImNOwWBMTcsrNXpsGzlzea VSaknkiQ/ZokBhORtx99ccInJQA4QCdXxqFJ07gmvwjJQ7IRH6NDxg6jkhr/ZrJa5EAJCt COXc1hruPwsUbe3U1hEnF/VXvprbIWfoAyV9Jj75nWvWhih5hpiFUnHfN8BlpOq0ZgL7c3 asXj6Gxfqx+0wEI+mgKUJd07f6POhBmUUo3DdurMLiBT+d7Gipr1HFr+n1MfjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992488; a=rsa-sha256; cv=none; b=McbJXye75NcJJELjx4yhN0AJeUtYK8QF3AUqZ+crih4Qn5Ren71PO0FOsx7cNl1oXSHW/5 +E4A8X+N0jV3GdwYpnFIQU8po+X9Tuq/PBn31LLYe134YIBCUNYfr/xty67oa7tZDDwZeE y2eOVEkhYfYTVYtTnizSbvo8OGgE8SNcIdCfcgYNX03Yx49UPFD1WGAfjEOFZNlpDY0AEi jXG9pXllTfcV9pt8Q/Bhd0L1+K+ISlyosuBHLh0/wDeKnStm+ksayS6MgPRe4VCpRBB6MI IA9pX6Lvl55ycWzWnegfbcQxIYYTAa6JEO2wBpcoR/EjAjweLHVI15ox1Or0RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMr5MmGzKWJ; Tue, 23 Jan 2024 06:48: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 40N6m8Jo058077; Tue, 23 Jan 2024 06:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m8O4058074; Tue, 23 Jan 2024 06:48:08 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:08 GMT Message-Id: <202401230648.40N6m8O4058074@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: d4c871243f06 - stable/13 - usb: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d4c871243f0616d94fbbc6e174f89638367de832 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d4c871243f0616d94fbbc6e174f89638367de832 commit d4c871243f0616d94fbbc6e174f89638367de832 Author: Gordon Bergling AuthorDate: 2024-01-20 16:32:20 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:42 +0000 usb: Fix two typos in source code comments - s/bascially/basically/ - s/assistence/assistance/ (cherry picked from commit f5e3329a5a480aa1b2904106b2fdfd999439455b) --- sys/dev/usb/misc/udbp.h | 2 +- sys/dev/usb/serial/uftdi_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/misc/udbp.h b/sys/dev/usb/misc/udbp.h index eb2c27d5f9ef..a12cc739ef80 100644 --- a/sys/dev/usb/misc/udbp.h +++ b/sys/dev/usb/misc/udbp.h @@ -63,7 +63,7 @@ struct ngudbpstat { /* * This is used to define the 'parse type' for a struct ngudbpstat, which - * is bascially a description of how to convert a binary struct ngudbpstat + * is basically a description of how to convert a binary struct ngudbpstat * to an ASCII string and back. See ng_parse.h for more info. * * This needs to be kept in sync with the above structure definition diff --git a/sys/dev/usb/serial/uftdi_reg.h b/sys/dev/usb/serial/uftdi_reg.h index 80936f80b6fa..19794413cf2f 100644 --- a/sys/dev/usb/serial/uftdi_reg.h +++ b/sys/dev/usb/serial/uftdi_reg.h @@ -8,7 +8,7 @@ * USB on the other. * * Thanx to FTDI (http://www.ftdi.co.uk) for so kindly providing details - * of the protocol required to talk to the device and ongoing assistence + * of the protocol required to talk to the device and ongoing assistance * during development. * * Bill Ryder - bryder@sgi.com of Silicon Graphics, Inc. is the original From nobody Tue Jan 23 06:48:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMt27pNz57PPX; Tue, 23 Jan 2024 06: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 4TJyMs6snVz4cvm; Tue, 23 Jan 2024 06:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3bEXF7j4jgePIkQ2uvNHcuNQiHjJ6Oh1tKzMZ73UiWY=; b=JiR/nmtGPOa4PUFi2G1ysAKi9GZbJ+F92MiYD3mGTMBi5V7meILAx1eWOwn7Fd6DoAu8Jv +YW3Gi0YX/QMszsRMHsWnjTrK3OGzRQyhRncPAzMcgdDrWN9r4EyXA872s436qeKGY3eVr UyxM4+imWZxJrnzExKKdxdKpiGGxSABHPmRlQO9In5C+VM9mNLWByOR6mE3yCQQzrJCTHD 5oSCeHN8ohmuuje1ngAU2MdRag6dNPrtwSNTv+75FDuACScVd7wwYoRgV/LAHJv7yMwuh/ z5ZwQCnmdtH2gEkV4ffPz/asukOAoz2wjzjKXNHp7F6ilUXbFbLxuQ6gJFaBZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3bEXF7j4jgePIkQ2uvNHcuNQiHjJ6Oh1tKzMZ73UiWY=; b=tZkbJDuKDhyxL+RS2TFVGLh9J4f2ZYOVA9NAAMgACa1don5S5U2FGl+weSRCs6DDs3cWUH 4KBSNI8FA1DlHfp1Zn1EK4GKVimfyifDW22y8H9+bNYivaYJ794qIKLXVFVvHfNBb6dJSd /E/JbJXEXc21Jre5eDmYgAIJA3MLekqJA5TjyE0j5yFV2rom4tWcUMRHthupNWSDrFpien Qn1ZYUjjVGh5i4YYgoDp5wLWERgi363QvEAnU5pwdnElG1j3CaXpDbaWvPUUWoJ3KibJ73 lzXFy5QnvOVc7JByUQaS8OnEamDrntzoVyhJaT/Q2odU5nvwJ9l2xDJ9Zstvgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992490; a=rsa-sha256; cv=none; b=Af2rnDJotKhPbTunMVfRd0HbJZX/l2a2h1hoJDgP/NdKSbo0o6K2sM06rg/OSNBDsIY3T5 sEraHHA4woos/XKuQPzHD2QK+darxZkzKuEameg5jTPqf5eDXfluq/lzRuLens6gb8TQ2z qTPa1CyAaIJIXqh6tdXnIDKwg9sXrZrNreHS8XY2z5fOaqUAL67TqvkeScnnIgvDwevkYM dsU2InTjXaXbS9UkV83VtJgWFfmj2hERHbYfHmjybHQxXF3KfhX44MXqHsdPY4Jyel4+Rj WKXXBuG9LCcGPLQchkYRnXQfTeIynxIFR/2o3SZpXtgks8MTMMiqukbOHQP44w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMs5zcTzKBJ; Tue, 23 Jan 2024 06:48: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 40N6m9VZ058132; Tue, 23 Jan 2024 06:48:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6m958058128; Tue, 23 Jan 2024 06:48:09 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:09 GMT Message-Id: <202401230648.40N6m958058128@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: 16f66b464e3b - stable/13 - vmware: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 16f66b464e3b4bf78954f674f4147d39cccbd596 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=16f66b464e3b4bf78954f674f4147d39cccbd596 commit 16f66b464e3b4bf78954f674f4147d39cccbd596 Author: Gordon Bergling AuthorDate: 2024-01-20 16:33:27 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:46:55 +0000 vmware: Fix a typo in a source code comment - s/withing/within/ (cherry picked from commit 623848af604116aa33bc8a66d2ac45b4cbaccfd8) --- sys/dev/vmware/vmci/vmci_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vmware/vmci/vmci_defs.h b/sys/dev/vmware/vmci/vmci_defs.h index cfa302ad11aa..466712c41cee 100644 --- a/sys/dev/vmware/vmci/vmci_defs.h +++ b/sys/dev/vmware/vmci/vmci_defs.h @@ -259,7 +259,7 @@ static const struct vmci_handle VMCI_INVALID_HANDLE = {VMCI_INVALID_ID, #define VMCI_ERROR_QUEUEPAIR_NOT_READY (-40) #define VMCI_ERROR_WOULD_BLOCK (-41) -/* VMCI clients should return error code withing this range */ +/* VMCI clients should return error code within this range */ #define VMCI_ERROR_CLIENT_MIN (-500) #define VMCI_ERROR_CLIENT_MAX (-550) From nobody Tue Jan 23 06:48:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMv3wxKz57PKH; Tue, 23 Jan 2024 06:48: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 4TJyMv0r0vz4csj; Tue, 23 Jan 2024 06:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUEjlyfutgaGl13j+4RiHmUEsisN+Mfip0A+vvN3iMI=; b=LC/paCUGSsZaE3DOEOSkC82WOX1zNuzIqtLXedfPk1YsUfNv4mIW9fTJV3HTa+kDZddDc/ fmz/6Is0TndDAzz8zjSoHdi9uwVYqBezlxTNC0zCIXFc6LpOvko+zv06KHWjo/Xq43VpOe mKfd7AGnwX6PGtI9ByosqB3rc5W+q+pctMZKowzkcb/wAVjgCL/ScQ/GZ+oKkPOQoWrpod LjRa6pqqt9hRZAmI28fWX3TwRmMo2Zmic6/gzitUfBYVpRARtIBb0OnZsQV8tgGzK/M5bf cJKoqWBsJwq+rjYCb8bfeWCLuP7jbmMwYrGGT6t6cMjLLcwyAn2h0DEdcrWPGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUEjlyfutgaGl13j+4RiHmUEsisN+Mfip0A+vvN3iMI=; b=V4fTNi1L/0NoR20l3uwSY6OUo0eHlZAZatZB5cmVkuppN6gx5HNbwCD5dFPy1nEdgs/eqz uatXgCkoFBuwlZDiWRD0ycO+771jac2wl87U05y+eUMDynvpbn0dzRxMzdxO2BuDRAeBok N4CIDLAoYr0+cXP3el2lA4U20gyFpoXlIuUkL6nbeadhyuCJec2ACjwZSolVdAfTgQsTIY PqmTgxDfaTqFaGl1KlfLYFv828z/ncv9fO/Hgs3HM0hd0P6c1dkAzHIu/n2oV329MNtMPy 1IgQ/12TH4171gVT3eezORuDPHXGpOLX+ddwAC1NhHFzepX8D8LeEe+Lk2C1OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992491; a=rsa-sha256; cv=none; b=vru+qNKa5QXDh7K17V72dO+2Wqc6XYeCJI0gqdDx4neX91l3xHb1tc+PPLRX8CgOzQdifp GyKzqADQFvrgcw92byGSIH+UfLFzimOvunhxJheVMU82vZXh/IrQgXbqERDT6RXLqI9M3E IKrjDaB516hP9uMFt5KXEE4i/TZURSpXdP769knHefg9N2Hmk75nJfCdfunFf7+bBbdJjj qlrMQulsjRw4UndoSHWS5QOkUfHx2NjvV0xaQw2rPodjSDVAdiRyDi/a5S3GYeHRb3h2+U vStKRtWW18jfidyRkYmIhORuDCI3bbkcuPxbI0Rgl2bx6ObiFeggrlDPRMhc1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMt73vrzKHh; Tue, 23 Jan 2024 06: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 40N6mA9T058188; Tue, 23 Jan 2024 06: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 40N6mAST058185; Tue, 23 Jan 2024 06:48:10 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:10 GMT Message-Id: <202401230648.40N6mAST058185@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: da3ddd852917 - stable/13 - netpfil: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: da3ddd852917ff49b96a49f7b916aecf950ca323 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=da3ddd852917ff49b96a49f7b916aecf950ca323 commit da3ddd852917ff49b96a49f7b916aecf950ca323 Author: Gordon Bergling AuthorDate: 2024-01-20 16:30:57 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:07 +0000 netpfil: Fix two typos in source code comments - s/withing/within/ (cherry picked from commit 938918a9f478e94fbe65ba84510e4755024560be) --- sys/netpfil/ipfw/ip_fw_dynamic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c index 2196157090c1..29ffe4f320ab 100644 --- a/sys/netpfil/ipfw/ip_fw_dynamic.c +++ b/sys/netpfil/ipfw/ip_fw_dynamic.c @@ -2456,7 +2456,7 @@ dyn_send_keepalive_ipv4(struct ip_fw_chain *chain) CK_SLIST_FOREACH(s, &V_dyn_ipv4[bucket], entry) { /* * Only established TCP connections that will - * become expired withing dyn_keepalive_interval. + * become expired within dyn_keepalive_interval. */ if (s->proto != IPPROTO_TCP || (s->data->state & BOTH_SYN) != BOTH_SYN || @@ -2563,7 +2563,7 @@ dyn_send_keepalive_ipv6(struct ip_fw_chain *chain) CK_SLIST_FOREACH(s, &V_dyn_ipv6[bucket], entry) { /* * Only established TCP connections that will - * become expired withing dyn_keepalive_interval. + * become expired within dyn_keepalive_interval. */ if (s->proto != IPPROTO_TCP || (s->data->state & BOTH_SYN) != BOTH_SYN || From nobody Tue Jan 23 06:48:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMw3pD3z57PVZ; Tue, 23 Jan 2024 06:48: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 4TJyMw1yrqz4cyQ; Tue, 23 Jan 2024 06:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rg3J+FTTDsuCwTgxtckQbtqEvF0r4pP4lSDNikFkSzA=; b=wa+smWL8S1JvOGcFAzT+cHylOefjJP53nrJkVlKwCtqKN+gtGk3P4wI0AdIDBVuQGghp9Y PTKXB11PHimyWFC9iA4MXuPA3WbFSmh4CuayIfPv/CqJP3X/lcMsi5TkQ58yFwqz4vgZWj oK/gV5z0/CZ2r++k218B23uEayXj0fESYXsPBYzXaJyWOTpZRvgc9l8FdIVwMZoaZzXnut KTzJv2BUfOMC6NMKO5vmOp7YIyioEeVNYHUSc5kAvjxiwPxz1rP7vrhThlTAats0ASDq+P YAMnmC6YLsBqWZV7OjzN2nzFLAYbp4/z0/njj4xat5lo8KuziCmhfV6qdQsvSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rg3J+FTTDsuCwTgxtckQbtqEvF0r4pP4lSDNikFkSzA=; b=vy6UmbscuuSy3NlxVA6iSWzVtFJYChpRA3ZdSKp8VdxRdKC8crjlGZlZ9DxvHAqZUodfnx Jy/1b3yEW3K6Z6nm8ENN0TySc99oUpQ4CLuOZyI6PfBWXN3izX4PakYxx02ZEUwaaufdVw ZWxRMerQYd/x5irKxLhrwAlRaXrFWs4kz7g9ed8L8CQPrBnsf1EdH7FvjDrGvW2Dgus4lU +PoF11uPDpEzDcaAkcG6GU6lUzF4M/1D48P0FLJ42bKTJoki74UbfYUSlIu+hwOmg9incS jBat0TqRj6IvNpLGgJdQzxmhFdL7MmRbvYH06A8bETcXG3lqEVw1/+O2sNGxRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992492; a=rsa-sha256; cv=none; b=fDzmxfYbFwjlGO30b8cjRzRTVQkYMTWKsdGHtjtMhUUAfURWL3aW2KhVyaQXRx/Cm756v4 VRIw7YuoPouAcJ7KTUOvRZyRqJjLj35e2jXFTkn65mZ03ciX115tk8spURj59KGsq8FylM Vn4i5oJgwXD3KU9K6E7e4gGewvzQsT2tInawdme6mVSmODDGYrcizwyogocc7kBTz2/hwM Xzihw/NP/EL7yAbPV6LbMkUKrLJomohGti5IEABsKdBko70/Bj0hgc56naY1UjbJXbLc44 D4Qm1WfKqZrCX7Kr7zLsG4Yhlt5Z+Rc1oDa3n0jce8rcLs1dBvvLkSKilzxSRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMw155vzKFS; Tue, 23 Jan 2024 06: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 40N6mC5n058240; Tue, 23 Jan 2024 06: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 40N6mCPT058237; Tue, 23 Jan 2024 06:48:12 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:12 GMT Message-Id: <202401230648.40N6mCPT058237@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: ab04ef09cfd7 - stable/13 - netgraph: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: ab04ef09cfd7aa9c1c3c6437e82eb2eed0a88c77 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ab04ef09cfd7aa9c1c3c6437e82eb2eed0a88c77 commit ab04ef09cfd7aa9c1c3c6437e82eb2eed0a88c77 Author: Gordon Bergling AuthorDate: 2024-01-20 16:22:28 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:19 +0000 netgraph: Fix two typos in source code comments - s/bascially/basically/ - s/simpliest/simplest/ (cherry picked from commit 7037ebe63dd1a2ff2a818359c58ca24b6d44388a) --- sys/netgraph/ng_sample.h | 2 +- sys/netgraph/ng_tag.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_sample.h b/sys/netgraph/ng_sample.h index 994f322cf05a..f7f7cb417626 100644 --- a/sys/netgraph/ng_sample.h +++ b/sys/netgraph/ng_sample.h @@ -73,7 +73,7 @@ struct ngxxxstat { /* * This is used to define the 'parse type' for a struct ngxxxstat, which - * is bascially a description of how to convert a binary struct ngxxxstat + * is basically a description of how to convert a binary struct ngxxxstat * to an ASCII string and back. See ng_parse.h for more info. * * This needs to be kept in sync with the above structure definition diff --git a/sys/netgraph/ng_tag.c b/sys/netgraph/ng_tag.c index accbe2d8452f..cc8b0a8f7536 100644 --- a/sys/netgraph/ng_tag.c +++ b/sys/netgraph/ng_tag.c @@ -258,7 +258,7 @@ NETGRAPH_INIT(tag, &typestruct); * One could ask why to have this structures at all when we have * ng_tag_hookinfo initialized to zero and don't need in and out structures * at all to operate. Unfortunatelly, we have to return thisHook field - * in response to messages so the fastest and simpliest way is to have + * in response to messages so the fastest and simplest way is to have * this default structures and initialize thisHook once at hook creation * rather than to do it on every response. */ From nobody Tue Jan 23 06:48:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMx5TYSz57PM0; Tue, 23 Jan 2024 06: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 4TJyMx2rjfz4ct7; Tue, 23 Jan 2024 06: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=1705992493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a/VsBtFDf6xWgPsn66aHaon0rUGlKePfuB/jhYta8OQ=; b=RT8yjfNNYwslh6MFgF2IJc5Epmq9q+GoArcNyaU5GCWKM33UZkoqwIBVFLtBWhye66AMPa bZvqSfnAI4hFVxeg9wOjZWHlfI1mCuCMOjStnsWK++cn6oLJt20fKBqV0Dm5Nf93dYFJCK HAwmgMvloVa2OpUPv99XxgCTIlF0H9I17xAAaq32gXCdmi51XUG3C1+FuwEXq6ABBv/daA xl3+Ywh5DuZnI60LfSER9KmBQYQL6W++0Em4BDEBwZHA6kUGCpqJh8WH086tFSkUJZf3BS CY0ky/z4zGoWsISxAMr/numDih32YXaoXY/UoUkPv0DpvZw1ThdnRa6Fl37T/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a/VsBtFDf6xWgPsn66aHaon0rUGlKePfuB/jhYta8OQ=; b=fYQ3DO5Szx/Qmblz91hWlQhDrGrbqzlI6kk/Ht26GmYsG8z2h/1uzJSkQeIQk+B8RzZUWp KdV7nndJxOXkvRWtvapj2WLVhzLlSoRV6DiSxeJdbzADBUNATzxKu/l9FX2O28F+tl198E I7aMAmks9LBF82k0vBV1TCCNKPknM8AVtsius/9DNBwDfT2CZD74nhzNsgLeVI1r0a+phg h2N7DVZTBk9KQZAKGMpri7XZefC5O6tVpNqkXVShr7H8lQ7woa0slLT6gEuIY7aynkq6ab bWXX+LhttIpqZjbEf7Ma21moAjItd2pWd9glDKoumhNkyuPe3ehQFW9ftsOMKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992493; a=rsa-sha256; cv=none; b=X/YggUp7qojSMb2CauSfBd4TqXF8k3fq/8HfV6d8sgZaCVqQJCIlTcA68vAEF/2zalMspZ 5nEOCX8kueqcjsxdy8MzTfvmGOQa5BE3Jx46RTVjf7MRgv2z67ER0AT/Lz1nyGFS4CVwHF mmZDWnfS3ssFlRdOeo1hPzcZCwgHJSzEP2Oeme0cWI9jslHt5UvPmkWA8gh7y7wELqU+Xw mbxEHtDchveAGe94AE1qAaNDPucsY+xQqNYqnR1xjRdLUpxI8Im/HvLgi1ezvn7lSIoGLh YKwaTHh33Qa6dRbsSRx9XsX390BMa0QKd8vTo+SszuDeSXL07YkYX5wnJXXBPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMx1yN0zKVL; Tue, 23 Jan 2024 06:48: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 40N6mD90058291; Tue, 23 Jan 2024 06:48:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6mD95058288; Tue, 23 Jan 2024 06:48:13 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:13 GMT Message-Id: <202401230648.40N6mD95058288@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: 4a66b63e9dc4 - stable/13 - net: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 4a66b63e9dc4e874a9a452b3e66d188be6db4f51 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4a66b63e9dc4e874a9a452b3e66d188be6db4f51 commit 4a66b63e9dc4e874a9a452b3e66d188be6db4f51 Author: Gordon Bergling AuthorDate: 2024-01-20 16:28:12 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:32 +0000 net: Fix two typos in source code comments - s/strucutres/structures/ (cherry picked from commit a2fcd3af5c8ad43e8d2c7b89f7bbe3edf2f22e2a) --- sys/net/if.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.h b/sys/net/if.h index 6916eb6e816f..c4fdf02c874e 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -286,7 +286,7 @@ struct if_msghdr { * extensible after ifm_data_off or within ifm_data. Both the if_msghdr and * if_data now have a member field detailing the struct length in addition to * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following + * ifm_data and the start of the socket address structures immediately following * struct if_msghdrl given a pointer to struct if_msghdrl. */ #define IF_MSGHDRL_IFM_DATA(_l) \ @@ -328,7 +328,7 @@ struct ifa_msghdr { * extensible after ifam_metric or within ifam_data. Both the ifa_msghdrl and * if_data now have a member field detailing the struct length in addition to * the routing message length. Macros are provided to find the start of - * ifm_data and the start of the socket address strucutres immediately following + * ifm_data and the start of the socket address structures immediately following * struct ifa_msghdrl given a pointer to struct ifa_msghdrl. */ #define IFA_MSGHDRL_IFAM_DATA(_l) \ From nobody Tue Jan 23 06:48:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMy5vJWz57PM1; Tue, 23 Jan 2024 06:48: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 4TJyMy4FYgz4dHQ; Tue, 23 Jan 2024 06:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZuKy2m4fJ2kGUKkg6qQZWPrJE17np4xZtLt4qPHUGk=; b=POD8DP6+ftqNkNFxIc/5MPfp/+r5Uj8ZDV0vvT8fst/qDjbW7YTez38gETIzp19OwnOPWv keg9/WwM6KQ/0thhGiKI8tM/hIFwfAL6KH6/WqxVwhp7/6qsb6oka19tgKPMi0UaK5Qmkb 1rkyP2Nb7IJW6oI3UD1NW+UnI3eSOYDDYphmZ8v0NIQiJ7R6fdj6H22R6yI6r6X+23z69i dupDAqztgzUZGGI1Xg7ifm7l31ryO9ZWryCZUnBIkY8ZOksW1U1mQ8jRmA9VJJKE6o5Qqb whbwWDiQ9gzKhpD3keNE1l+SR1tZmX709IAvEhvplciA5PgP3dK3kK72ZddUWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZuKy2m4fJ2kGUKkg6qQZWPrJE17np4xZtLt4qPHUGk=; b=kWOuip/W9XfyGvmo8RQ2jpyq6Z4fYhEBrpSR+Ja+gsxxI2iDHUcvmY7a/Z7OrbSjXMGjF+ GPF3In7mkeW21I9PRVZ5+bYSLqP/sgUs+s7F68YM87T3tKgJhcx9aSabucP3mt/RF9Jtqz loAKAQGpATDM2oNf6m4DbldAexafdgVI3rJpWRQhFur9OGThk44A4xx4giKnM4Kb91qFOC RFMkbj42+vYN2AzXUpoemCkXB8AenDaNpjiDe37nBYbSqwSOXSGYxXsMlY1OMiHrcLDwB+ LckNHKT/5RUDFFIBypVFKLKTGEBHeXji8czUp76RlWGSfdAlCOzCjWiHeZmcFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992494; a=rsa-sha256; cv=none; b=mxnFqSkJcXuzBtjqOdWE6bu1mi43nuygbl9bBTqqGMY0VXOKZy0uYx92oCF+HdBs4w6S8M I2BKJLbbZyjPs/ABfGGdf+He99LFO78EC4QcjSceGNvab0vDc2kzU04Il36S6hW3p57I9I pxwRVvd0jH13fj0ATS7xuUaGOFa1YLDNkVK9QL22eSVO/+Xdlsu2DEeDr5fHPCX1FMNGCe dByxtfECv2dyBr+/ZwskIrlbdkigxJ0OkPoSN0LCLJI3q+uahfzblqpvf6lfwsrP1rGBtF 1Vwn9GpBwKKRbH00TQ/soGnO4JM7sBXhcZJr0C6kSg75UM1bcvRwlOA8p1ZQtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMy3Mw5zKHj; Tue, 23 Jan 2024 06:48: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 40N6mEJX058353; Tue, 23 Jan 2024 06:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6mESQ058350; Tue, 23 Jan 2024 06:48:14 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:14 GMT Message-Id: <202401230648.40N6mESQ058350@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: e184cd907e80 - stable/13 - atse(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e184cd907e80b4364c3d23b87e709d579d6eb89d Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e184cd907e80b4364c3d23b87e709d579d6eb89d commit e184cd907e80b4364c3d23b87e709d579d6eb89d Author: Gordon Bergling AuthorDate: 2024-01-20 16:35:51 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:43 +0000 atse(4): Fix a typo in a source code comment - s/addresss/address/ (cherry picked from commit 2b1e4e5be3047411df5e4d5442aa7de6489a0309) --- sys/dev/altera/atse/if_atse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c index 080c67174781..b13c1ca8c563 100644 --- a/sys/dev/altera/atse/if_atse.c +++ b/sys/dev/altera/atse/if_atse.c @@ -582,7 +582,7 @@ atse_get_eth_address(struct atse_softc *sc) sc->atse_eth_addr[4] = atse_ethernet_option_bits[8]; sc->atse_eth_addr[5] = atse_ethernet_option_bits[9]; - /* Handle factory default ethernet addresss: 00:07:ed:ff:ed:15 */ + /* Handle factory default ethernet address: 00:07:ed:ff:ed:15 */ if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 && sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff && sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) { From nobody Tue Jan 23 06:48:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJyMz6m33z57PVh; Tue, 23 Jan 2024 06:48: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 4TJyMz5PsQz4dF7; Tue, 23 Jan 2024 06:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9V6mB12ERiKZnpcqE/BL1V6u+kXmT97gsgsCozUxN90=; b=GHa+wYThteiSftcTkGCVNHLwifeQYkr8WVFUf3FlEFMS+zW+iPiQXBGFgm2VdQUuiE5MIZ oKsE0cXNUtAst0mFlhVMwhe//umH+HqrkPsx0ugJuW6HQPuItoBkT06y8iudNsDyRSFUe9 kvst/oqX1m9xD6FPbi03Wx7v8/lAi8tAjPoCtkKuvK/aopkhiUX6H8lHI+K7Qfmm9p+55u cu4veHAF9GwoOeXZr/GYMzlhGc9wPUHoXqcUduCRfP88vR1IrFljN7nf6brE1RlDe65K0B io/3IXCR154eMGGNsy9AjCGILNvBBAtzz7QaR5iyt8K4n98M7JwKn6rulUzRRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705992495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9V6mB12ERiKZnpcqE/BL1V6u+kXmT97gsgsCozUxN90=; b=tM6mdofZBpGOQuRrottRdEjZDIKG05GlPq1HnrnVRJhgFLSyN1W/bBCZ5enf2XTX1U16YS EXYbwsGFoztBL/ZxEygIvGNvhqqiVWunT6Y2mpmit50nIrBddjdQ//m7+VomLu72Z/zuwC 5Z6IkY8U9FPM3uZzhilCGZ5tjkhbiljEx/hIcYbGUGRR1F/vmqe11jqtr3iGLELqvZabvR oBOc21rCCJ9rpcpCnq965T/CYpgUGGZb5tyMZKfDJNudYwwWhyzkbUKCutSoRR4ywthdsF 1xvistGG9EVSMPbXymAzg+fckTbih+PeboksKfKDMbDtpjE+RQh21lnzCqOXag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705992495; a=rsa-sha256; cv=none; b=sbFZLM8K+xPTrHaN3mj3ID8013H8SoHkmqbVvY0Pe5M1gLq4vhtcnzNKyBnbJXbcAhbL9f Urz9KAEfsGwg6NwYEFYnp6kSNPPAFOpNwH9FaTGs8RkEeOvNQV8iG6/Qn+jJ9DuvJhrzjG dN21kxjpGubIMHyFBIjVFHYvixx3bplZVzWMFyodVtD+8py9P9PAm6pRYpU3AgoZyC1WOM vQnRdveU2vltzncNWklQnJ5jtEhFE61ayq0YGAQw52U8XGRYLNeQZ1xYR+QQ7RxwPy/Ta9 9OoMeWffklmVLxOQIaxc49jB7HSSryvtTANWJTOPrVNHo9YGDahqtypGlh6/vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJyMz4WlVzKBL; Tue, 23 Jan 2024 06:48:15 +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 40N6mFBg058407; Tue, 23 Jan 2024 06:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40N6mFun058403; Tue, 23 Jan 2024 06:48:15 GMT (envelope-from git) Date: Tue, 23 Jan 2024 06:48:15 GMT Message-Id: <202401230648.40N6mFun058403@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: df6f381ac6d9 - stable/13 - _umtx_op.2: Fix a typo in the manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: df6f381ac6d9a92a146cc2cb36e403dbc9bd1f7e Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=df6f381ac6d9a92a146cc2cb36e403dbc9bd1f7e commit df6f381ac6d9a92a146cc2cb36e403dbc9bd1f7e Author: Gordon Bergling AuthorDate: 2024-01-20 16:26:34 +0000 Commit: Gordon Bergling CommitDate: 2024-01-23 06:47:54 +0000 _umtx_op.2: Fix a typo in the manual page - s/interpeted/interpreted/ (cherry picked from commit b2ec175fcaac90fc6a1caf066656eaa092f32611) --- lib/libc/sys/_umtx_op.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/_umtx_op.2 b/lib/libc/sys/_umtx_op.2 index 9c0f1f425e47..60f90c32ba35 100644 --- a/lib/libc/sys/_umtx_op.2 +++ b/lib/libc/sys/_umtx_op.2 @@ -424,7 +424,7 @@ regardless of the kind of backing memory. Only the address of the start byte of the variable specified as key is important for determining corresponding sleep queue. The size of the variable does not matter, so, for example, sleep on the same -address interpeted as +address interpreted as .Vt uint32_t and .Vt long From nobody Tue Jan 23 14:20:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TK8QG2VJGz56vkp; Tue, 23 Jan 2024 14:20: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 4TK8QG236Gz4MmZ; Tue, 23 Jan 2024 14:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706019654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IckEmpE2FcVM727sNgobgfU1+YNF9lTgFVOLWKZckDY=; b=vFCfJ1NAC82QJZ4vhNku2K6GOr9iR3XsHpbnjE4aVNjZEMVzdAzwEKisrmt0Y3VCXJELyO eCA2XCCzkE27moy70q1lAd2BTZlscU2D08Y/8Y7x3KZ5mX+01h9DpWwW7aUl5xqShRi4uE OZED1LMX/rwYpBxVxtDOX1fmxDEe7XKn+EXIA/GDhvF3PJfRxYR0vVQZImi7brT56Gu4CM 9K6zatZSrlhGAqxey5xuTQHRaZ0RB6L371c63WTCCxkMdCbVP2KHaYH19kkwqz44ib3MUg AHXKAim9XCoR/saOXtzHQcUEa0zIk3Ypfsqs6GEhKwBnjlOGCx2yie24VlMCdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706019654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IckEmpE2FcVM727sNgobgfU1+YNF9lTgFVOLWKZckDY=; b=wSKu7GW/GaCXZfPKmJZcXSSHdLMoaxuFyzZvixG9wOo4fkJ2syju4GwVF8QI2Brk6xwhtb Kkl26yk4Dcv2sfscXl/n3vX+djSseNA5BjF1Kvpf73dnnrP6yFxjGzWvtm08eCfmrrfCHZ sXkKOPGXe/sN+pUydBxTR01RlRoRQJveC9RnS9FRx8DpJpebg3S1mfiBCrl4Z/YLCnq+eT IP4u0W2vGTg9abbSX0cGBMXpwq4nJoNI6FbUKJH0WQy5ba07Xjy1ztpDGssbBgh88hojQm bU/ZecHTRDq4aJt/d1JFW5Eb8ZqMoD4BaSzLBp0j7uBFKRkQ4b57Y91C9mpOkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706019654; a=rsa-sha256; cv=none; b=GroXvziJINSPwvo1w5nv+5E+S9OBj9agP7A6HAL0OJp+Hln3v+5YvWrOooEjMGrOdQ8gjj NqYLl+JqxB/71+KLFkq1njadkoi7ogbLHsQk6vLpJTDkCyltgyuOL6geItd797/s89Wa1/ PTstkJQfiZkeHWF5GbYWG14IAaRflTia/mOX7tB0mTCouNEnkHYzCaIlVIyXM5G+r6fnvM vPk0hKOUIwQdQVrWi+t1GRyNBR64SjqMkyraCKbQluFn+49fVhte50WZBYjZ7zeh/6mtFN a7tGMpyPqC2heyKin8AU1J1ZsrV7QMusy1XwMgCsrflztCih9lURoeHZcWUtKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TK8QG0qQXzZ79; Tue, 23 Jan 2024 14:20:54 +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 40NEKs88029179; Tue, 23 Jan 2024 14:20:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NEKsdg029176; Tue, 23 Jan 2024 14:20:54 GMT (envelope-from git) Date: Tue, 23 Jan 2024 14:20:54 GMT Message-Id: <202401231420.40NEKsdg029176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 7edbf69b79c1 - main - stand: Add 1440p to the list of known resolutions. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7edbf69b79c13debff251e6edfee1f57eeac3a6b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7edbf69b79c13debff251e6edfee1f57eeac3a6b commit 7edbf69b79c13debff251e6edfee1f57eeac3a6b Author: Dag-Erling Smørgrav AuthorDate: 2024-01-23 14:20:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-01-23 14:20:27 +0000 stand: Add 1440p to the list of known resolutions. MFC after: 1 week Reviewed by: manu, kevans, imp Differential Revision: https://reviews.freebsd.org/D43391 --- stand/defaults/loader.conf | 2 +- stand/defaults/loader.conf.5 | 3 ++- stand/efi/loader/framebuffer.c | 5 +++++ stand/i386/libi386/vbe.c | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index 08406aa43bc8..e0062bbc8149 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -95,7 +95,7 @@ audit_event_type="etc_security_audit_event" bootenv_autolist="YES" # Auto populate the list of ZFS Boot Environments #beastie_disable="NO" # Turn the beastie boot menu on and off efi_max_resolution="1x1" # Set the max resolution for EFI loader to use: - # 480p, 720p, 1080p, 2160p/4k, 5k, or specify + # 480p, 720p, 1080p, 1440p, 2160p/4k, 5k, or # WidthxHeight (e.g. 1920x1080) #kernels="kernel kernel.old" # Kernels to display in the boot menu kernels_autodetect="YES" # Auto-detect kernel directories in /boot diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index 8b7508c8a5b2..42e5712d93b8 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -21,7 +21,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.Dd December 20, 2023 +.Dd January 10, 2024 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -315,6 +315,7 @@ The following values are accepted: .It 480p Ta 640x480 .It 720p Ta 1280x720 .It 1080p Ta 1920x1080 +.It 1440p Ta 2560x1440 .It 2160p Ta 3840x2160 .It 4k Ta 3840x2160 .It 5k Ta 5120x2880 diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c index b8e61dc73acf..56693187b576 100644 --- a/stand/efi/loader/framebuffer.c +++ b/stand/efi/loader/framebuffer.c @@ -77,6 +77,11 @@ static struct named_resolution { .width = 1920, .height = 1080, }, + { + .name = "1440p", + .width = 2560, + .height = 1440, + }, { .name = "2160p", .alias = "4k", diff --git a/stand/i386/libi386/vbe.c b/stand/i386/libi386/vbe.c index 8fbfaa9a3475..61339a1e7911 100644 --- a/stand/i386/libi386/vbe.c +++ b/stand/i386/libi386/vbe.c @@ -84,6 +84,11 @@ static struct named_resolution { .width = 1920, .height = 1080, }, + { + .name = "1440p", + .width = 2560, + .height = 1440, + }, { .name = "2160p", .alias = "4k", From nobody Tue Jan 23 15:39:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKB9P3RBJz573vV; Tue, 23 Jan 2024 15:39: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 4TKB9P2rc3z4myB; Tue, 23 Jan 2024 15:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706024393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mQ4D1VOHHMCP3b4yp7mdFUj3nmZLyjGX+0o3htwJnzs=; b=JOY2yScePCkkZuXxMVevi1yb3JJ43S6jPxLwCloaZtSUiBs5d6RRt701rfG7H5+epnwCFS QagDzjMU2rZP1IaqGIf9538Myb7H9XB1YQPbska3FjAB0F5V/Rc5V1hz07vcaQPRWPICQw TESM72xB1mIWnrO+IkDx8q5n6vAlSrJvDRtdv3uPP2KoFj6E/mElIKO89+frwZ+zmm1lue +HmPGxrT2jl0pvC8oi9fVVBLtNSLBHe+bSyLYVYtXKNmhswhqr/uqzJoKp7crZ0Z2nAa0j ZSh90WOfPWVhm8kTce1kA0n6D+NOevNIEv4PAii1zio1Tehy7HbrXmWbDUIF+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706024393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mQ4D1VOHHMCP3b4yp7mdFUj3nmZLyjGX+0o3htwJnzs=; b=qO80gfaWFLC0lueZxZiB/7yvOg2KxB7NPsHKQWa28pBqpDPSg88mMxSJcTn86B+86eaL8c hCljVt8C0zT3ZRBygovaty43s8kbcjYiiWCUZADL94BM5RPNWkK6ZmsUqJBWlL/gmrsJPg UiAAYHVG5TYxjOcbFfBGdNDxT/m+9a/dlBIO//pneFBFDjD3vrppzCSJ5sqSrYSHCsOnNt QukGbaKFVfyfPR7xuZDeRMzf9OWVEiExYTTY5uMCPtQgGNZW0Ar3Ors8ArqpoUNezNw7T8 C0KcNjlTKHPcfu9f3RR3w7wF4Svc/jzhGsZ8N9ZnBHT2ekLnKeLDARqnOm77kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706024393; a=rsa-sha256; cv=none; b=agevotIIVXkrxX6dbOVQHmsUSX60TAL4wN7oURcdn1QSOEEwKHYkLF86ZcWEy1ZUYB+P4V ANWM7ZKl4h4gCX9IOeIezgNU27CY5S6fcDz4ZIFktvHX6907f6gI2Mn2HtkzBSBRzCtuBf PLHz2/BID3IhTgmaBfKV7ofVEWzef8nyJz4HCXNSc5IxWEWUvImlB6kVOS78aZSCG8bUIX 1OCfERRfJeOfLMisG21BecuO3Tq4p8NHYmmYf6pbyD3p2HEbPn2/DY2RgdwrsUh8aZFxZT ayHn1UaJqPzk+qp9oQq0tsHkqG75vy6ohAhBegbQz9+zzRZEUzD/OIKuFvVYsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKB9P1x9nzbYv; Tue, 23 Jan 2024 15:39: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 40NFdrZA055930; Tue, 23 Jan 2024 15:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NFdr7h055927; Tue, 23 Jan 2024 15:39:53 GMT (envelope-from git) Date: Tue, 23 Jan 2024 15:39:53 GMT Message-Id: <202401231539.40NFdr7h055927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 9f550134a4a4 - main - acpiconf: remove trailing space in "Mesurement Accuracy" output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f550134a4a4c8319e79f0ae9f44c58d30f6c26f Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9f550134a4a4c8319e79f0ae9f44c58d30f6c26f commit 9f550134a4a4c8319e79f0ae9f44c58d30f6c26f Author: Christos Margiolis AuthorDate: 2024-01-23 15:39:40 +0000 Commit: Christos Margiolis CommitDate: 2024-01-23 15:39:40 +0000 acpiconf: remove trailing space in "Mesurement Accuracy" output No functional change intended. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43561 --- usr.sbin/acpi/acpiconf/acpiconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpiconf/acpiconf.c b/usr.sbin/acpi/acpiconf/acpiconf.c index 44c39ca66368..4f5cb08325dc 100644 --- a/usr.sbin/acpi/acpiconf/acpiconf.c +++ b/usr.sbin/acpi/acpiconf/acpiconf.c @@ -131,7 +131,7 @@ acpi_battinfo(int num) if (ACPI_BIX_REV_MIN_CHECK(battio.bix.rev, ACPI_BIX_REV_0)) { if (battio.bix.cycles != ACPI_BATT_UNKNOWN) printf("Cycle Count:\t\t%d\n", battio.bix.cycles); - printf("Measurement Accuracy:\t%d %%\n", + printf("Measurement Accuracy:\t%d%%\n", battio.bix.accuracy / 1000); if (battio.bix.stmax != ACPI_BATT_UNKNOWN) printf("Max Sampling Time:\t%d ms\n", From nobody Tue Jan 23 15:40:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKBBD55DPz57464; Tue, 23 Jan 2024 15:40: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 4TKBBD4gSPz4nMN; Tue, 23 Jan 2024 15:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706024436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LysRkmOpV9/z9PW8GhyB/Ji05d2SKDQOU7EnoUbiKU=; b=P6Xosr1UKkWDijJC68jinRTEsF3/0i9C6qrVoIiCf4XB9ArzAmRrEHe0Yr9lQwgeWA2X2v qaTMmyA1Ac1tiGkJhi89Pi8tkaUEqeLNPhTnBKf2LKMG794NwVJBM2rgr7ENYzxhMAPnEA wH86VkG5iiGN/w/XxrU+QWzof3FcSZusAaVcKkH/dFMcTf/EuE27UGCKzAwEj7Z86hWf0E 2wBMQJYh6GKi0VoP0B6qLwB4zCHkjVcsn7b3eAdLhUYXPJ7AOm3xF2vrwionZpX5zO1p72 ga7zdgs1+bMEA5qyHE5a5TqRJCp351R85o1/rpUuawh5vYghxR4G73hbGRULLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706024436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LysRkmOpV9/z9PW8GhyB/Ji05d2SKDQOU7EnoUbiKU=; b=SsBfjco+iAJg/gV5t3tF0gAOOOmCLy4XEg/fXlZeek3r7wC6BgUASLXCKNfYTBulvhgG78 37T/dRTYSsL3iIp917ZaYOtlGUq3bf4VNC7XYXHjnGJlq0Bf4gAp8QET7RXNOgcl6Co1mZ 02hEoEFov6UMo6L2dESa0pkGPe8NhM3JLBSvcUyE7LG/WsjCJss5IF4lDW6K7adAvGeqCy NzBskaFgKfA2sUfqVsqnK8o95nISP6tK7WjlNSadvXhw+I3Kc/DbHpgUalH4FRn+XUl4OR TwpV6HHPabJGOieguuieKuBDVmOvbCKpFWNmkq/l7fknv9T+EMLGmV4I2s++dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706024436; a=rsa-sha256; cv=none; b=R87g3V7fGQWaapClnXxHyeyxFWGlrYvPGLaXY2zYpA5gA6L1IDyCZP8RHJpH5GLpSWn318 cFjrP4lxY2gy2yyvahfi6faQmOeeClWZjCBdjBJ7G5I4iKzLS0jB+wQlDViiaJhWZ3LssK FfAqJFbwylB1BJrphNMjZpuzWIN8WIFMQtXZnA4VgupN6T6u012u2zSCFDBwra0Jiiyxd9 WSDF1rt2uuwR9PMqFNt4lSiMXr9nvJZsUDOmwWTolDdpegSP3lEL8LdjvsmM4HkO8of5wh cQwRjzNgIlWM8lWkopbtr+rTC0auuQnyYI8N4eEOSZW51xuGOyB6YlENWBmDDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKBBD3kb7zbnr; Tue, 23 Jan 2024 15:40: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 40NFeaCl064701; Tue, 23 Jan 2024 15:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NFeaYV064698; Tue, 23 Jan 2024 15:40:36 GMT (envelope-from git) Date: Tue, 23 Jan 2024 15:40:36 GMT Message-Id: <202401231540.40NFeaYV064698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 380b7eb30947 - main - sysctl.8: fix format typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 380b7eb309478e1aac1609a3dfe1c28436add1c4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=380b7eb309478e1aac1609a3dfe1c28436add1c4 commit 380b7eb309478e1aac1609a3dfe1c28436add1c4 Author: Igor Ostapenko AuthorDate: 2024-01-23 14:34:59 +0000 Commit: Kristof Provost CommitDate: 2024-01-23 15:40:14 +0000 sysctl.8: fix format typo Signed-off-by: Igor Ostapenko --- sbin/sysctl/sysctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index 837282e80a9b..528efe6697b5 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -322,7 +322,7 @@ option has been deprecated and is silently ignored. .Xr sysctl 3 , .Xr loader.conf 5 , .Xr sysctl.conf 5 , -.Xr security 7, +.Xr security 7 , .Xr loader 8 .Sh HISTORY A From nobody Tue Jan 23 16:45:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKCd70cdFz57gNY; Tue, 23 Jan 2024 16:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKCd705C3z4vbH; Tue, 23 Jan 2024 16:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706028331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CdZqraYeLLjzio4RUkRn2HMhdfUTR1/3yqZXtoPoKDw=; b=BRQebV1hASERdB4JxscuqQNoDtN+hU/WGxK+toSoLpacvDUA+kMRzK6z9rlbZpNg5UcSt9 kV7F0jx/mW5WeauIuk4mwrIY4lMITjJQZkogKZ0gj7NnTQCRcXE4gcEklXs1d87/CZic3O nq7tlRphrAFLdQdqZFBHAnfqZeI0NSv6zhA7JUrB6KJPW1DRDudPCdOvMg7VShcp07ipk0 lm/CFTJgh94kIXNN686opI/AfLCr6OW8uEd9rGV3Qu6o9rcaVbZXlkPsARZ3fdytW8nUmv jnH3OYENY5uet5MEFy2OvpsLGDeHZumpzk8rLddJM1KzhST6slLhlCu1qhJZrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706028331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CdZqraYeLLjzio4RUkRn2HMhdfUTR1/3yqZXtoPoKDw=; b=F3X5FRF0v5Wyean8ifUoaMWjhNP/23KcL9vvzyFR9jFZa40Z0CHjZHRSlZF36N9wxwzq1D FiM7GNUZwByIPzRZu1OUVsvc5ACRAMfHw4cFQJhWR3jMO4lV2EEAaSwIHbqDaquPAz2cAO FhpwuuZvJs/vqKm99nTWiNJK7w+S6lQLzjFfN4W72sFIMBTloFlykYl8QMdtxqdqrM+4ha XptSdokrUr7d7DoZTp8FhL4TAlvHh5E/D/5Z9TG9ON93ffdv8b5d12zhBdA0r9Vo2X8K09 jU4rjIZZkWglhUKctkP4ZHs5xRlKhP20IkS4+D5UKVbvxYSmYDRJCix1/CFxDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706028331; a=rsa-sha256; cv=none; b=meA+uteF/kde9t7SyJxpIxq5XE5PiWxJ4wToSFEdk3wP+Q26Hg8q3PTMFZ1wFx9u3XAZds SRfzXyFdDj0dLAdVaK+WLKX2itPKEdoG8CjkM0Xe0ZYwLkv8p+gpHl7GE+RrcpsYQaIMDj xx7ngOUpiIlVxBspXKNGHJQGzbZPNqSzL9pqrvB5gFBv4mdTWa9keo8W8NNyECWqy4e/GG Mjd7YxBpbm2gtvDACZG/7GrC/k0pHQUATwx8Hs9fv2+ffRtIxiHcJNBdWv6fu4plrw1S++ GlYAMxisNriwdxDPXqBLajyJ7zKhPQadCtHbeXKZ2t2pXw7xKbJzpnnQSmCPeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKCd66DVXzddJ; Tue, 23 Jan 2024 16:45: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 40NGjU6G074248; Tue, 23 Jan 2024 16:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NGjUps074245; Tue, 23 Jan 2024 16:45:30 GMT (envelope-from git) Date: Tue, 23 Jan 2024 16:45:30 GMT Message-Id: <202401231645.40NGjUps074245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: cfa2c78aee85 - main - bhyve: Avoid underflows when handling remote commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfa2c78aee859bfc6549951bb6a36085fdd374e8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cfa2c78aee859bfc6549951bb6a36085fdd374e8 commit cfa2c78aee859bfc6549951bb6a36085fdd374e8 Author: Mark Johnston AuthorDate: 2024-01-23 16:40:40 +0000 Commit: Mark Johnston CommitDate: 2024-01-23 16:40:40 +0000 bhyve: Avoid underflows when handling remote commands Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D43480 --- usr.sbin/bhyve/gdb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 2d49469c2e11..f1aabbde43fd 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -1052,6 +1052,8 @@ gdb_read_mem(const uint8_t *data, size_t len) bool started; int error; + assert(len >= 1); + /* Skip 'm' */ data += 1; len -= 1; @@ -1163,6 +1165,8 @@ gdb_write_mem(const uint8_t *data, size_t len) size_t resid, todo, bytes; int error; + assert(len >= 1); + /* Skip 'M' */ data += 1; len -= 1; @@ -1557,7 +1561,7 @@ gdb_query(const uint8_t *data, size_t len) data += strlen("qThreadExtraInfo"); len -= strlen("qThreadExtraInfo"); - if (*data != ',') { + if (len == 0 || *data != ',') { send_error(EINVAL); return; } @@ -1608,7 +1612,7 @@ handle_command(const uint8_t *data, size_t len) case 'H': { int tid; - if (data[1] != 'g' && data[1] != 'c') { + if (len < 2 || (data[1] != 'g' && data[1] != 'c')) { send_error(EINVAL); break; } From nobody Tue Jan 23 16:45:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKCd81ZY6z57gW6; Tue, 23 Jan 2024 16:45: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 4TKCd811Bzz4vqH; Tue, 23 Jan 2024 16:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706028332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ry1phDUK9yF+m066OlXZ6SimsrTHTemGxLv2n0CkZ4=; b=EqRQ7gGtYV7oFldZaaO62vZzy9v23xOavymP1s1aX/jwGcoq3R/eaYTCPB86TbPSL5iSbJ 6TS1+razpgOiTthPBXLSNwYDihqFQLvq1c8or0XHjWLaA6lLtS638iTbmIDWnF1YyefNm1 f80BkkKntWuY2BwiPIcSJWz7qYk1/EbjWSNvQuXEcfKZBq0JZP/nSy0Pn3IzOOLXwh0oTG y2lYEWOFmzJ9FfLOnuEIfops2J5GR4fJ1VAR3O78wzBuLheoQKaqnFydA1s+IDc+bICeuD YbOHgIUkrlOu+6hDMXZk9OrEcuA3DBOIScbdR1gY8ZqAicH1JaV8OsCV+TYsHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706028332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ry1phDUK9yF+m066OlXZ6SimsrTHTemGxLv2n0CkZ4=; b=C7WWX/q0pNTE7pXVGgUXYoE1tIa8jZd3Lu3/WDm2DCv3cpo13Py3nx6TNLGLbHHT7q9bLk XudG178g4iTPvEs8jSGy6+tzVcQUZFMl+jflHqYqtvRySTlo0eOqgZlLVzPZ0TmUxriCmj 0Fg6cCuAp6pDWVA+o3ulkBjQHK2j8r7U6IUeIws0UaVFWAZ2w365f9VpMm/4eDK63TU4f1 1/VWVHLWAcLMYDgr+YHUWixeEkHuNpfqMFu1Qownl/cxxzTlZlMJnbPFrG63yPV8jjdjen QJkJmNkMJeQDNULp37dmZKx+r0KFVXKPVpCjyGda3W2I/A/PgLvGw/a5zO84xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706028332; a=rsa-sha256; cv=none; b=MYXl6/cQK1HdEEg5QzlZcf/ETwkK4vg0R6aECbwT4Eq+5knWlrYXwFbbVdVpmBwXQOV0a5 PJw+nAEIzaPj24vVwhn6S493l1A4Fw7+4x18A8Dh6fQvx0GwtxQFne4xHP+p4bWiYVe2AM yrT7CvNxCkU6ytswhxmpSpyVXcjQpIV5yqwK6dCA4/2tj8jwAx01AX8ogtjN9sPlPHGOR4 E5GqVfz+C0i9JoxXIf+HOpY7keMAVCIFqm1tnc0tt6+rxelmFKPTTqCF8MiOApK1ed8fqh AC2IRma9sa6MqNp4vYO0vl5vlnNeQ/Z3vGsJBG9gzKeplghwh9rHDS0i9QilQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKCd8059Gzf30; Tue, 23 Jan 2024 16:45: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 40NGjV2R074293; Tue, 23 Jan 2024 16:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NGjVNW074290; Tue, 23 Jan 2024 16:45:31 GMT (envelope-from git) Date: Tue, 23 Jan 2024 16:45:31 GMT Message-Id: <202401231645.40NGjVNW074290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5e728af444b1 - main - bhyve: Simplify register definitions a bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e728af444b16f480ec0f43803ca2a7a3e6e2e48 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5e728af444b16f480ec0f43803ca2a7a3e6e2e48 commit 5e728af444b16f480ec0f43803ca2a7a3e6e2e48 Author: Mark Johnston AuthorDate: 2024-01-23 16:40:52 +0000 Commit: Mark Johnston CommitDate: 2024-01-23 16:40:52 +0000 bhyve: Simplify register definitions a bit It's awkward to have separate tables for information which is logically connected. Merge the gdb_regset[] and gdb_regsize[] arrays and update gdb_read_regs() to cope with the result. This makes the addition of arm64 support a bit cleaner. No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D43481 --- usr.sbin/bhyve/gdb.c | 89 ++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 55 deletions(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index f1aabbde43fd..2ef684e82c4b 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -134,58 +134,34 @@ static struct vcpu **vcpus; static int cur_vcpu, stopped_vcpu; static bool gdb_active = false; -static const int gdb_regset[] = { - VM_REG_GUEST_RAX, - VM_REG_GUEST_RBX, - VM_REG_GUEST_RCX, - VM_REG_GUEST_RDX, - VM_REG_GUEST_RSI, - VM_REG_GUEST_RDI, - VM_REG_GUEST_RBP, - VM_REG_GUEST_RSP, - VM_REG_GUEST_R8, - VM_REG_GUEST_R9, - VM_REG_GUEST_R10, - VM_REG_GUEST_R11, - VM_REG_GUEST_R12, - VM_REG_GUEST_R13, - VM_REG_GUEST_R14, - VM_REG_GUEST_R15, - VM_REG_GUEST_RIP, - VM_REG_GUEST_RFLAGS, - VM_REG_GUEST_CS, - VM_REG_GUEST_SS, - VM_REG_GUEST_DS, - VM_REG_GUEST_ES, - VM_REG_GUEST_FS, - VM_REG_GUEST_GS -}; - -static const int gdb_regsize[] = { - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 4, - 4, - 4, - 4, - 4, - 4, - 4 +static const struct gdb_reg { + enum vm_reg_name id; + int size; +} gdb_regset[] = { + { .id = VM_REG_GUEST_RAX, .size = 8 }, + { .id = VM_REG_GUEST_RBX, .size = 8 }, + { .id = VM_REG_GUEST_RCX, .size = 8 }, + { .id = VM_REG_GUEST_RDX, .size = 8 }, + { .id = VM_REG_GUEST_RSI, .size = 8 }, + { .id = VM_REG_GUEST_RDI, .size = 8 }, + { .id = VM_REG_GUEST_RBP, .size = 8 }, + { .id = VM_REG_GUEST_RSP, .size = 8 }, + { .id = VM_REG_GUEST_R8, .size = 8 }, + { .id = VM_REG_GUEST_R9, .size = 8 }, + { .id = VM_REG_GUEST_R10, .size = 8 }, + { .id = VM_REG_GUEST_R11, .size = 8 }, + { .id = VM_REG_GUEST_R12, .size = 8 }, + { .id = VM_REG_GUEST_R13, .size = 8 }, + { .id = VM_REG_GUEST_R14, .size = 8 }, + { .id = VM_REG_GUEST_R15, .size = 8 }, + { .id = VM_REG_GUEST_RIP, .size = 8 }, + { .id = VM_REG_GUEST_RFLAGS, .size = 4 }, + { .id = VM_REG_GUEST_CS, .size = 4 }, + { .id = VM_REG_GUEST_SS, .size = 4 }, + { .id = VM_REG_GUEST_DS, .size = 4 }, + { .id = VM_REG_GUEST_ES, .size = 4 }, + { .id = VM_REG_GUEST_FS, .size = 4 }, + { .id = VM_REG_GUEST_GS, .size = 4 }, }; #ifdef GDB_LOG @@ -1031,15 +1007,18 @@ static void gdb_read_regs(void) { uint64_t regvals[nitems(gdb_regset)]; + int regnums[nitems(gdb_regset)]; + for (size_t i = 0; i < nitems(gdb_regset); i++) + regnums[i] = gdb_regset[i].id; if (vm_get_register_set(vcpus[cur_vcpu], nitems(gdb_regset), - gdb_regset, regvals) == -1) { + regnums, regvals) == -1) { send_error(errno); return; } start_packet(); - for (size_t i = 0; i < nitems(regvals); i++) - append_unsigned_native(regvals[i], gdb_regsize[i]); + for (size_t i = 0; i < nitems(gdb_regset); i++) + append_unsigned_native(regvals[i], gdb_regset[i].size); finish_packet(); } From nobody Tue Jan 23 16:45:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKCd949Mpz57gKm; Tue, 23 Jan 2024 16:45: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 4TKCd91npWz4vdj; Tue, 23 Jan 2024 16:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706028333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWKoqLJhSSUwRa2j7MUUIqPtiqSRZNXESxf6doUEy+M=; b=EcTth+D5bRq0EwbJFwl6CZWinCfOczt1jQ5egQp28jQLjpzwu+HUVX3FtW2f75B1S/Tryy QGwr4SIzdpA59JfeOipTNAAqUBrDHEblsywQ8uFetCOKIf332wHY5v/wFOJlMjcE1wVzcE TRePi4ECLS04OpjFuFEqkrYA9pYYA3fDlY9RZAKcuGomP/2FwGrVLxwueS0l9buQkxr5bx LtwPvVBb0DEBtRWNQWqSgujbtwSkRWaVWWAztK7zH8LB6LIHEUlMSRUB9qt5GgBHx27sHZ FOP5V6OMxFzYrwxibaIssMpUap0P1EsfoeS4Te9Fz2qYevLsBaV43b8qQDjuhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706028333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWKoqLJhSSUwRa2j7MUUIqPtiqSRZNXESxf6doUEy+M=; b=fX2jn1Vh217+IuhnrB0BuR6HgWHlM/IQj6Pky8suQbraZMhbDaGOn3ofpurldeuY4r0JGQ M4ARsgo10ZUiFORK0IAdmPRT7WSezlaQwxpPKI4akzb1XJ93dHWQ8gkZAJ82iES6uyPLCm G2e9kwbQLTvRcHDp5GfXQR2goTL+3ubaANfjaJN9EfOiVtsDLP0D48fTbJS/XqbiZDRKuc JykU8mZvlxcTqQRZTo1HqbuHqXUiPV+ON00BaPDcuvaOqkO/LWYCrx/vMyOldXvIwcgRPE ErYYOoh6JLcrQHh5A0UdyUebtrkg7waVk0fkkM9RxbT95/4Oi/2XZ9o8fdAv8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706028333; a=rsa-sha256; cv=none; b=cyjDhJjCHkiXRx3VZ3TPuVSzNWaN79BfSqLH2+75W4hO0Cy7juRDhpWnD1+TXLaonRP8ub fDpyfehTF4FI0wzZ5sWq52HeuMZbB8vCWa4jh5RgNqm6BnNlcXEJedxpfAw0Gwpk8raEPq 1Ljv2KOYSpVrxlanGP7jnKDsHEZe+V9xeVSmyGRufJDpEe5yn07fF1GsimOQrfOOdUjNiu 2g+wtwZ55OXXMnmY8Y7MhPbqxQOWUKwfOaaSv4ME0Oe9/S+5iNf78W2g+jfVc3ZygawMib X/EjGZVY5RvMt3/EG3Hk+IeBKplMH4fjLSpoQc70/v8UxK5SH+krIx8On1OJAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKCd90rMJzf31; Tue, 23 Jan 2024 16:45: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 40NGjXdv074350; Tue, 23 Jan 2024 16:45:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NGjXjZ074347; Tue, 23 Jan 2024 16:45:33 GMT (envelope-from git) Date: Tue, 23 Jan 2024 16:45:33 GMT Message-Id: <202401231645.40NGjXjZ074347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5f086566e02a - main - bhyve: Prepare to add arm64 support to the gdb stub List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f086566e02a3d21dc840564b90d46f1d3b829bb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5f086566e02a3d21dc840564b90d46f1d3b829bb commit 5f086566e02a3d21dc840564b90d46f1d3b829bb Author: Mark Johnston AuthorDate: 2024-01-23 16:41:13 +0000 Commit: Mark Johnston CommitDate: 2024-01-23 16:41:13 +0000 bhyve: Prepare to add arm64 support to the gdb stub In particular: - Stop assuming that the breakpoint size is one byte. - Avoid referencing the "rip" field in machine-independent code, use a helper. No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D43483 --- usr.sbin/bhyve/gdb.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 2ef684e82c4b..4f427b1a0863 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -69,6 +69,13 @@ */ #define GDB_SIGNAL_TRAP 5 +#define GDB_BP_SIZE 1 +#define GDB_BP_INSTR (uint8_t []){0xcc} +#define GDB_PC_REGNAME VM_REG_GUEST_RIP + +_Static_assert(sizeof(GDB_BP_INSTR) == GDB_BP_SIZE, + "GDB_BP_INSTR has wrong size"); + static void gdb_resume_vcpus(void); static void check_command(int fd); @@ -95,7 +102,7 @@ struct io_buffer { struct breakpoint { uint64_t gpa; - uint8_t shadow_inst; + uint8_t shadow_inst[GDB_BP_SIZE]; TAILQ_ENTRY(breakpoint) link; }; @@ -263,6 +270,12 @@ guest_vaddr2paddr(struct vcpu *vcpu, uint64_t vaddr, uint64_t *paddr) return (1); } +static uint64_t +guest_pc(struct vm_exit *vme) +{ + return (vme->rip); +} + static void io_buffer_reset(struct io_buffer *io) { @@ -931,7 +944,7 @@ gdb_cpu_breakpoint(struct vcpu *vcpu, struct vm_exit *vmexit) } vcpuid = vcpu_id(vcpu); pthread_mutex_lock(&gdb_lock); - error = guest_vaddr2paddr(vcpu, vmexit->rip, &gpa); + error = guest_vaddr2paddr(vcpu, guest_pc(vmexit), &gpa); assert(error == 1); bp = find_breakpoint(gpa); if (bp != NULL) { @@ -940,11 +953,11 @@ gdb_cpu_breakpoint(struct vcpu *vcpu, struct vm_exit *vmexit) assert(vs->stepped == false); assert(vs->hit_swbreak == false); vs->hit_swbreak = true; - vm_set_register(vcpu, VM_REG_GUEST_RIP, vmexit->rip); + vm_set_register(vcpu, GDB_PC_REGNAME, guest_pc(vmexit)); for (;;) { if (stopped_vcpu == -1) { debug("$vCPU %d reporting breakpoint at rip %#lx\n", - vcpuid, vmexit->rip); + vcpuid, guest_pc(vmexit)); stopped_vcpu = vcpuid; gdb_suspend_vcpus(); } @@ -963,7 +976,7 @@ gdb_cpu_breakpoint(struct vcpu *vcpu, struct vm_exit *vmexit) gdb_cpu_resume(vcpu); } else { debug("$vCPU %d injecting breakpoint at rip %#lx\n", vcpuid, - vmexit->rip); + guest_pc(vmexit)); error = vm_set_register(vcpu, VM_REG_GUEST_ENTRY_INST_LENGTH, vmexit->u.bpt.inst_length); assert(error == 0); @@ -1277,8 +1290,8 @@ remove_all_sw_breakpoints(void) TAILQ_FOREACH_SAFE(bp, &breakpoints, link, nbp) { debug("remove breakpoint at %#lx\n", bp->gpa); - cp = paddr_guest2host(ctx, bp->gpa, 1); - *cp = bp->shadow_inst; + cp = paddr_guest2host(ctx, bp->gpa, sizeof(bp->shadow_inst)); + memcpy(cp, bp->shadow_inst, sizeof(bp->shadow_inst)); TAILQ_REMOVE(&breakpoints, bp, link); free(bp); } @@ -1294,7 +1307,7 @@ update_sw_breakpoint(uint64_t gva, int kind, bool insert) uint8_t *cp; int error; - if (kind != 1) { + if (kind != GDB_BP_SIZE) { send_error(EINVAL); return; } @@ -1309,7 +1322,7 @@ update_sw_breakpoint(uint64_t gva, int kind, bool insert) return; } - cp = paddr_guest2host(ctx, gpa, 1); + cp = paddr_guest2host(ctx, gpa, sizeof(bp->shadow_inst)); /* Only permit breakpoints in guest RAM. */ if (cp == NULL) { @@ -1333,15 +1346,15 @@ update_sw_breakpoint(uint64_t gva, int kind, bool insert) } bp = malloc(sizeof(*bp)); bp->gpa = gpa; - bp->shadow_inst = *cp; - *cp = 0xcc; /* INT 3 */ + memcpy(bp->shadow_inst, cp, sizeof(bp->shadow_inst)); + memcpy(cp, GDB_BP_INSTR, sizeof(bp->shadow_inst)); TAILQ_INSERT_TAIL(&breakpoints, bp, link); debug("new breakpoint at %#lx\n", gpa); } } else { if (bp != NULL) { debug("remove breakpoint at %#lx\n", gpa); - *cp = bp->shadow_inst; + memcpy(cp, bp->shadow_inst, sizeof(bp->shadow_inst)); TAILQ_REMOVE(&breakpoints, bp, link); free(bp); if (TAILQ_EMPTY(&breakpoints)) From nobody Tue Jan 23 16:58:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKCwR2qf4z57hTr; Tue, 23 Jan 2024 16:58:47 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKCwR1gFfz40Pt; Tue, 23 Jan 2024 16:58:47 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706029127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6SsgqemcSeDHwFYGUPoccRyGaIqAS50egiFV6fZKK9s=; b=ehrntuzuCCbx0U8759qHcfSp+yK2ny8F5xfcE4QxPsbQyQUwX4f3TmNotXD27gdF0qWcy5 oga62YVtffvEyKMlj/ggm9P2f1h0W2X7SdNsH8cUGHFKWSjd6PFa4RwyL5fp/bKvMekPJ6 qeK01DOItFD2pO/t6aPZQ8lctjnpoScn8Y9JpB0WMcI214ZhI6q9rw/e3jEcs7m73HtuoI a+F9gSmgo3jN0SEFM/2wbgZim0bdpo950W7GlXcYAZ2/Q9388Ng9Wf+l9YhNyQRhAAKVmz r5L9pQdY2I8xYRRn6iO0F/+cfOyGxU13iPK3HKhaQVIAD14x6SQ4ezFbLZCkOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706029127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6SsgqemcSeDHwFYGUPoccRyGaIqAS50egiFV6fZKK9s=; b=vv3FqcLk2r6MdHHPx+28vwfvmnI1Ysic0KPP43g+beILTDlHl7gza77jrrLvSVVVPHHnfB SMmGf0rjde/Yr7aMUCUqq22m7mu8gI7Hf8zCcrPAKTcgjOv6Qo3c4v7NQ9ZXqMcoWvUS2z JOWH5D+yHkTYxb/v/YlkcxLRJSStvy3W+91BEszFAz3O1fLIdM3VNJD+Iw1FiuuMf91k/5 Aue2uqj0y6vTTqn05+ejXn8WQxV8MbWYN0csn0OuCbFapNJKEo2twTFFhE1+ogF+gLaqTf Pv7e3pwoigym73Qy/xgsdcvDIM3MQrBBcfukoMcQuHm98RmhrZh4IeRxQ7O0NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706029127; a=rsa-sha256; cv=none; b=uVQVrbDrxcowRk4Vw9goI+q9gqemZrzGWAn0vqNb4VZ8YK1qIRJ+3n0SYG3QMuFkGfP/4Z LJXDvPKCkb70JAGd3LzIBKL/9WP8QI6gNY9vDITP0F+ZXjH5dPdOZj7wXxZva2VaW2Ew2K SPx4rAPCX34F+VEDITJpxASiRB7G3mIXByMFngz1V0M/TMpASSnM0Xlf3hteX4UUViXFfE 0GARIVRZ/3XNAF1K7ghmOBFg3fCTuoExnB8GAzPAuTeAMNiZjBz3hAyo5AEUUAaGWab6/V KPgr/Ty+vhwpFjiNNC3GrR+Ijef+RXKge2Wf5pYS7EmWdsmv3gLSEvZ78joTpA== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 2BD18FC7; Tue, 23 Jan 2024 16:58:47 +0000 (UTC) Date: Tue, 23 Jan 2024 16:58:47 +0000 From: Alexey Dokuchaev To: Christos Margiolis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9f550134a4a4 - main - acpiconf: remove trailing space in "Mesurement Accuracy" output Message-ID: References: <202401231539.40NFdr7h055927@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202401231539.40NFdr7h055927@gitrepo.freebsd.org> On Tue, Jan 23, 2024 at 03:39:53PM +0000, Christos Margiolis wrote: > commit 9f550134a4a4c8319e79f0ae9f44c58d30f6c26f > > acpiconf: remove trailing space in "Mesurement Accuracy" output Shouldn't it read "Measurement"? Also, why "accuracy" is capitalized? To be fair, there is no consistency among other entries whatsoever. :-/ ./danfe From nobody Tue Jan 23 17:45:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyh5mklz57mnc; Tue, 23 Jan 2024 17:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKDyh43nTz46rQ; Tue, 23 Jan 2024 17:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MW7vGQfqJpA1bqy2tjg3YuhBx7dIVlRXsVROjL1FKBU=; b=yVUxlvhZYHBgAJoyWEo/WJKghjr2qG9XBbOv8h1sQFwH1wNLBSWIcoWi07Cd42ekXhRuMG Roy5FCmilD6WTbWkr9ZOh+PnplVGJW6hI5qh0ESrgnyR+pElhNICCxkE8Dud5YM1o5t+wn e9ik031jfcPWlipx2w5vwGLlEV+rr9DFkUBUAtCwA8cfxzRjBK9pvdfZaSXIBpamjwk8a/ US4/LLQcFgxtiUQRJ1tptaxqR1XoumfwtZ93dBzX7Ee7Uk2Xg9ZubylQMVOmK+ijPCp/MQ 6czXCNM2ZNCJt4iSWxX4B0PTUdA7vlsy0ZjOvMcrWjOsYLAFciCn7ZAN1OQEBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MW7vGQfqJpA1bqy2tjg3YuhBx7dIVlRXsVROjL1FKBU=; b=eEa6w727oB12BPACz6NY+Vc6BSjlXnhNaT64899AfSuvvzBNfSxZskhvPp1rMRhrFk3CTH jVOCpRILZ/cZQe3EzIdYw9ftdeSvKbzg0WKCBAV+3z57v1Id3KeqPbNSt8kGVyU8IFYGnx 3OBQEy6AphypT+BzeqxBNzv9ustZuWO7dN3ebpcFkjOxFBMUlRrFuPxw0FtI2PjdACVz/W TdmuG59wF9TfKzmn6HMVXZK2+U3weIDpWDcZykiSUrQfJ6n0EFFnKYh3U8qJY7mHvmU05M oFxgnZIN+v/zH6VCvtny6miXxOkFtIpIvWqbLM33ABFepmvSHFgK69HgQLUrTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031948; a=rsa-sha256; cv=none; b=kdtFkWDC2FFAwVQdMASKt1FpSVvj1Feqjnjp2PXk+Un5YstG9bFDXHJ+QFkfc+k2Raipfr Coi1S+cL9yyVQC03iUZud6OFo9bwWJ+yGI8iXMYWYsJB7iUIigjykFk4L429AYGmQHdTPi 5puZjfmswwZCjjM9bXaijDLSYWdpJGoy4Tloa69m8YJqOFWOy7cprbI/lFMSDfjkz5HGsz I7131PfVk8jC1LdM0zXt8tokbG/atLMTevZaisRgBjab7po/bQWN5t8+52gPSkf0043cBa L7nGT5EAtqDN05c3tCvrMJYkogF2HNQEm4D4zSTk3MB16cKG6sjJCZ/frYyIEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyh37p8zgNN; Tue, 23 Jan 2024 17:45:48 +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 40NHjmlo075516; Tue, 23 Jan 2024 17:45:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjmjC075513; Tue, 23 Jan 2024 17:45:48 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:48 GMT Message-Id: <202401231745.40NHjmjC075513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 23e3b83ab61a - main - pcib: Add helper routines for [de]activating PCI_RES_BUS resources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23e3b83ab61a440ccce20da7fbf1340d58db361c Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=23e3b83ab61a440ccce20da7fbf1340d58db361c commit 23e3b83ab61a440ccce20da7fbf1340d58db361c Author: John Baldwin AuthorDate: 2024-01-23 17:35:08 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:35:08 +0000 pcib: Add helper routines for [de]activating PCI_RES_BUS resources Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43427 --- sys/dev/pci/pci_subr.c | 32 ++++++++++++++++++++++++++++++++ sys/dev/pci/pcib_private.h | 4 ++++ 2 files changed, 36 insertions(+) diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c index 71485875ebe3..d0f6c9500b17 100644 --- a/sys/dev/pci/pci_subr.c +++ b/sys/dev/pci/pci_subr.c @@ -379,6 +379,38 @@ pci_domain_release_bus(int domain, device_t dev, int rid, struct resource *r) #endif return (rman_release_resource(r)); } + +int +pci_domain_activate_bus(int domain, device_t dev, int rid, struct resource *r) +{ +#ifdef INVARIANTS + struct pci_domain *d; +#endif + + if (domain < 0 || domain > PCI_DOMAINMAX) + return (EINVAL); +#ifdef INVARIANTS + d = pci_find_domain(domain); + KASSERT(rman_is_region_manager(r, &d->pd_bus_rman), ("bad resource")); +#endif + return (rman_activate_resource(r)); +} + +int +pci_domain_deactivate_bus(int domain, device_t dev, int rid, struct resource *r) +{ +#ifdef INVARIANTS + struct pci_domain *d; +#endif + + if (domain < 0 || domain > PCI_DOMAINMAX) + return (EINVAL); +#ifdef INVARIANTS + d = pci_find_domain(domain); + KASSERT(rman_is_region_manager(r, &d->pd_bus_rman), ("bad resource")); +#endif + return (rman_deactivate_resource(r)); +} #endif /* PCI_RES_BUS */ #endif /* NEW_PCIB */ diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h index cf689026a033..d8a354c0e498 100644 --- a/sys/dev/pci/pcib_private.h +++ b/sys/dev/pci/pcib_private.h @@ -160,6 +160,10 @@ int pci_domain_adjust_bus(int domain, device_t dev, struct resource *r, rman_res_t start, rman_res_t end); int pci_domain_release_bus(int domain, device_t dev, int rid, struct resource *r); +int pci_domain_activate_bus(int domain, device_t dev, int rid, + struct resource *r); +int pci_domain_deactivate_bus(int domain, device_t dev, int rid, + struct resource *r); struct resource *pcib_alloc_subbus(struct pcib_secbus *bus, device_t child, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags); From nobody Tue Jan 23 17:45:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyj5wwcz57mqs; Tue, 23 Jan 2024 17:45: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 4TKDyj5Mkhz46wT; Tue, 23 Jan 2024 17:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qx8q00kikTWirWZ/UPG5yZrxGz3PVcHlVYjLR/n4n7M=; b=U1PbjV4sgj+gtLHUnfP/SBi8wX0fArbwxUexVb1HTw840pBPhI3FHiTSKFTJjex+nH2p3G sHrGZPkcadGYA3LrNQlbgTjJknuuj5JGITftGWslTWhj0pIunvYKkXSCmqiNOXEOr+okku LtHmw7YLGvypM644MtqJJnnK9XM7t3wOORWXpGcV7fIvFjC9Y1lINroNXPrjDT1N2IA2fd FMrxR0pBHpzj/RTsJZAFN5cuv6Yn2JV2pWzEi+OPnv5vaeki2Njv9gbo/xXua6ATXuhzMO uv426Uulf61ft9hTZGmoaPOcOluO1bNsxHmqjav136tOelmSgVUt+INUG39o3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qx8q00kikTWirWZ/UPG5yZrxGz3PVcHlVYjLR/n4n7M=; b=mrJzHcYZNEbAeZUgnzqYAr40mHdGKRNvAKKXyyt0zfoMmLo74n6UoC6tMW9+2LNiSrvuGQ nMinb9tmgP/Mj7vIK8r3hzGLVOUyPJuG1bfNKRsIcPBZKTpI6vgUNOQiC0ffZPTGMBkaMU p69YRkeFlESXxsrqwReAwWiSRhvGp2rcvx29bzVDuH7F/Hb4zyJQykqd/TXKJvoptcV6mW bMrf9lZjkrZwj3An3NZDXCxMiUyeIkthVtPU+HBP4c3NX4aTqlG/Zz0ttJvMx9XMZpG0TP QMJsi1mnHsK3kb46HTcl5bHbt9PeqnaN/IMwWkiag9W0TMPm6Kfc8aeFWi38tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031949; a=rsa-sha256; cv=none; b=b7zSPS3xg9Cz6NNlCJpWvOt5O7MNG28ytPIo6lQGvwWZoeFGlCzrcv79vRIEDzLG/VRSyF 1CoVn02+0xkkRpkeG8QZbpr0GvupdC00g8aSrs22Lk/T+vhBKDdm70lcb0elC1h6upQGqF 2r408ALR18opknKSthIQSpiEJmOWW8N5d0tvl7vIoqtbp6yxzQ1g7EB63tHFVEI4dcBoYN UFUhKWhTufe5C0NMlLGn71LL+w3qNjPG2ZdekDnyUIslWx0T251eyulNHq0QMop5O/c3xe e1s/LeqAu5m8ulsuG1bzgJu2qwF+lXBBxUqETfH3VREQCndsufyOlucZCZ2rjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyj47hZzgQd; Tue, 23 Jan 2024 17:45: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 40NHjnkW075568; Tue, 23 Jan 2024 17:45:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjnAc075565; Tue, 23 Jan 2024 17:45:49 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:49 GMT Message-Id: <202401231745.40NHjnAc075565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c2d4fef658e0 - main - acpi_pcib: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2d4fef658e0dfd998115f1395cd8705b432e3c8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c2d4fef658e0dfd998115f1395cd8705b432e3c8 commit c2d4fef658e0dfd998115f1395cd8705b432e3c8 Author: John Baldwin AuthorDate: 2024-01-23 17:35:22 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:35:22 +0000 acpi_pcib: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43428 --- sys/dev/acpica/acpi_pcib_acpi.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 06e6bc233720..451a8d8b736d 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -103,6 +103,12 @@ static int acpi_pcib_acpi_adjust_resource(device_t dev, static int acpi_pcib_acpi_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r); +static int acpi_pcib_acpi_activate_resource(device_t dev, + device_t child, int type, int rid, + struct resource *r); +static int acpi_pcib_acpi_deactivate_resource(device_t dev, + device_t child, int type, int rid, + struct resource *r); #endif #endif static int acpi_pcib_request_feature(device_t pcib, device_t dev, @@ -128,11 +134,13 @@ static device_method_t acpi_pcib_acpi_methods[] = { #endif #if defined(NEW_PCIB) && defined(PCI_RES_BUS) DEVMETHOD(bus_release_resource, acpi_pcib_acpi_release_resource), + DEVMETHOD(bus_activate_resource, acpi_pcib_acpi_activate_resource), + DEVMETHOD(bus_deactivate_resource, acpi_pcib_acpi_deactivate_resource), #else DEVMETHOD(bus_release_resource, bus_generic_release_resource), -#endif DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), +#endif DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_get_cpus, acpi_pcib_get_cpus), @@ -764,6 +772,31 @@ acpi_pcib_acpi_release_resource(device_t dev, device_t child, int type, int rid, return (pci_domain_release_bus(sc->ap_segment, child, rid, r)); return (bus_generic_release_resource(dev, child, type, rid, r)); } + +int +acpi_pcib_acpi_activate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + struct acpi_hpcib_softc *sc; + + sc = device_get_softc(dev); + if (type == PCI_RES_BUS) + return (pci_domain_activate_bus(sc->ap_segment, child, rid, r)); + return (bus_generic_activate_resource(dev, child, type, rid, r)); +} + +int +acpi_pcib_acpi_deactivate_resource(device_t dev, device_t child, int type, + int rid, struct resource *r) +{ + struct acpi_hpcib_softc *sc; + + sc = device_get_softc(dev); + if (type == PCI_RES_BUS) + return (pci_domain_deactivate_bus(sc->ap_segment, child, rid, + r)); + return (bus_generic_deactivate_resource(dev, child, type, rid, r)); +} #endif #endif From nobody Tue Jan 23 17:45:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyl0zjdz57mYC; Tue, 23 Jan 2024 17:45: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 4TKDyk62r7z46tG; Tue, 23 Jan 2024 17:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V+JSmsl4ayVtECJ9KiE6QwutNWEDWjSFIQvmWoPkmng=; b=c8qrWiIhf/9Tg3QVAZP86i/i4s5RpQ5E+wc2Mw8VN535Y2cXjk0WnNi9kvNTye697CVKgO +js3PLD40NR/8Ylj3dfCp02vNbAef/sHeww+jTW8+iqYmBIfeN+ua7lmZz2bOm1JUvfxdU 5MYHoVhtfajwhZiZpkCREM1+lmMmfrlXhVCDsoCWAaX32+Cz/H5RTSLat2+9mKq94yy6kC UXonopKi/vW8xMQFitF6mZdmAi/cma2IFfPVpiRw1sBoY0pNrq9a0F4/VkMrIGRTKXEw78 0wzhkRnm7k3DnHzed061m0w1Iou4Cfy6NrIUXnHbpUmSCPKvewHRfhrHjYVolQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V+JSmsl4ayVtECJ9KiE6QwutNWEDWjSFIQvmWoPkmng=; b=aA5mHDhUxV9wvDL9KXZCmInB5JuRTQ0SS3y52Cdeo/7ls7HyD0Xdv9vuPI/WQ7pD6AZpPQ QNfUySV4P8eDwy15aZV7OrouZFMk2M2dbHXUkyrucDQKhrrVoau6dCvkt0RXBXVMftxjYi xVEhp4igMxoKpm10Nlw1QZrIcmaZfoVG/cf8bmIGoVDRKNxz1u0CifqG6imfFyjSHdPgie NMeDp+li3f3/lNs17etNq3HlW/cEnN4VlzXsOih1SdD5p6h+d5VLFaDwlTcp/YfNkzmiWV qBMDwDcWaG4YT56eEabB/4+b3ashR+C+1/lafTY+afbMGv6WsMeOnMDn4Mrw7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031950; a=rsa-sha256; cv=none; b=khjTzT05+5LzEZz914QnZ27ecTs7j71PZ5rX0scacE6RoKizvOvP9hRh6O02t9GF1cfIPE H0XJpkFfunrzeY1iT4UhNPS8mClSNrtPBs15qB/DAAu81rVSghWxf6e4c/cUgK+kcmRCRF igBMMz4davbDmUpFaFr0Vcc77/dtfEH4MLNkOGW/QQWexWbW2UlZJXBDfON3L1uCL3mLAI lokWOZw3KzRsiSaIi61/csRCLDU1tm0oq48w6A3bQzb9z2c4m3q5VYJX95MJXNpYrX9bcj dcOugI3JrgsJoq2G0Nxzd8OgAAhxpQ1SQcKeV6SsIhK8mwa+7u0/bM/V28MV6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyk53hPzg8x; Tue, 23 Jan 2024 17:45: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 40NHjoFZ075613; Tue, 23 Jan 2024 17:45:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjoS0075610; Tue, 23 Jan 2024 17:45:50 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:50 GMT Message-Id: <202401231745.40NHjoS0075610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e9eb353b324a - main - pci_host_generic: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9eb353b324a3d051f81dde91d9f9f0fc044d822 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e9eb353b324a3d051f81dde91d9f9f0fc044d822 commit e9eb353b324a3d051f81dde91d9f9f0fc044d822 Author: John Baldwin AuthorDate: 2024-01-23 17:35:36 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:35:36 +0000 pci_host_generic: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43429 --- sys/dev/pci/pci_host_generic.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 90361a7258ed..43b6d26e9217 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -504,9 +504,19 @@ static int generic_pcie_activate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + struct generic_pcie_core_softc *sc; +#endif rman_res_t start, end; int res; +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + sc = device_get_softc(dev); + if (type == PCI_RES_BUS) { + return (pci_domain_activate_bus(sc->ecam, child, rid, r)); + } +#endif + if ((res = rman_activate_resource(r)) != 0) return (res); @@ -529,8 +539,17 @@ static int generic_pcie_deactivate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + struct generic_pcie_core_softc *sc; +#endif int res; +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + sc = device_get_softc(dev); + if (type == PCI_RES_BUS) { + return (pci_domain_deactivate_bus(sc->ecam, child, rid, r)); + } +#endif if ((res = rman_deactivate_resource(r)) != 0) return (res); From nobody Tue Jan 23 17:45:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDym2Pdvz57mFq; Tue, 23 Jan 2024 17:45: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 4TKDyl6wVwz479M; Tue, 23 Jan 2024 17:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KmZSuwjZ22iBLoXXPNI6CE3wi2rfGV+djHnBTr7ULXA=; b=KnoXHjZO2jNlRWoP6jnmIym+QnJaax8FckCGXOHn5zhr6TaA+SmYuegwF0mHQnUrqhWO4l jtiLZs+k9Bj6HR4PQ7xxKuQ9+05NhiLXQVVpYJoewIJPvL9/zUpXz8wl5h6JkvpgzKliLf LJleQOvaqguEYpcKCWgbX7lAkjYVjb3h6yZV45Q7shnVnnHaZGHjixzuJwtlmmvafaPzO2 w7VhAbD3hSNMzCGWT/h8MH63w5mB5lP8x8yFB792vLi+CwgBHplb9GDCU/9zbBdf8N/7d+ TuTPdAzRQ2933SZ94x3B7PtqXuJcZnzXFUM4IkUe/Rx693mgxlXx25AhdycAUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KmZSuwjZ22iBLoXXPNI6CE3wi2rfGV+djHnBTr7ULXA=; b=h64Xq/3l4pqlr3S/SU3Ui7OOmtiftDkqTKgeQr+Qk4Suwmhbf/PAfH4fjP6/NH1Uv8nriQ 23jrs+Uz2ObamzZuGc6UGVTXOvu11aOGAZ2D300vUUkBQ/23S8Rvmi0FYWJHKWWBoqPlPL iAWdwIp52d2jR9A4xsdIGH9nEZ1ewj+EwnLSK6Vcu+Hv3M41isr7pESanEsloYJHEtSm2W EI4AKaJHtSrctKL/8TlsWfqoXhcqOcxvEAuNGG+QQ7yqy4NhNDPhVQ5Y9wQ39OKjspK+Rd b7zK6LI3b/rVU2SJ12f1EmPPtl47fmefN346L5YJer0OoS3mgPYJtwbhuCKLHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031952; a=rsa-sha256; cv=none; b=atBnzPEEb4Nesz6g5+Mv46pYWuT9DnzCLL0IsyCfBE/m0AkZ+KN3wQTo+6E7p9GpiLK0vx bq0lgkuOOMabXXjQ60+PrrmW7ll46FmCaieRkHY16x4D76r8RBp8VCrL17oRtY1tsS6dCD 70Uxqryuk8bLWjOXpgGfUU7MGedfahv0QgYXQHRPyuz96RIzoeMxt+Fck3Ak4Qctvfinra frjsDbL3Vf55/an16iVUydkllp/IO8u6kwMzjxtzEcsv7XIHjqxyqnDRRNigE6dARsJxSf XvHWXM2d7kPxgLidVubTz8yjtbfCfVHdV6ixAXnpBYd4YJzoCfUgrDyXlMUBHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyl61tczfpP; Tue, 23 Jan 2024 17:45: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 40NHjpP7075658; Tue, 23 Jan 2024 17:45:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjpf5075655; Tue, 23 Jan 2024 17:45:51 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:51 GMT Message-Id: <202401231745.40NHjpf5075655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 31e15e531c51 - main - x86: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31e15e531c51be35c6907bbb6b1a5ab125f08a0d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=31e15e531c51be35c6907bbb6b1a5ab125f08a0d commit 31e15e531c51be35c6907bbb6b1a5ab125f08a0d Author: John Baldwin AuthorDate: 2024-01-23 17:35:47 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:35:47 +0000 x86: Use pci_domain_[de]activate_bus for PCI_RES_BUS resources Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43430 --- sys/x86/include/legacyvar.h | 4 ++++ sys/x86/pci/pci_bus.c | 22 +++++++++++++++++++++- sys/x86/pci/qpi.c | 4 +++- sys/x86/x86/mptable_pci.c | 4 +++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/sys/x86/include/legacyvar.h b/sys/x86/include/legacyvar.h index 2c9cf1391934..5627e9b90306 100644 --- a/sys/x86/include/legacyvar.h +++ b/sys/x86/include/legacyvar.h @@ -62,6 +62,10 @@ int legacy_pcib_adjust_resource(device_t dev, device_t child, int type, struct resource *r, rman_res_t start, rman_res_t end); int legacy_pcib_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r); +int legacy_pcib_activate_resource(device_t dev, device_t child, int type, + int rid, struct resource *r); +int legacy_pcib_deactivate_resource(device_t dev, device_t child, int type, + int rid, struct resource *r); int legacy_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs); int legacy_pcib_alloc_msix(device_t pcib, device_t dev, int *irq); diff --git a/sys/x86/pci/pci_bus.c b/sys/x86/pci/pci_bus.c index d06cfca53673..cfe0a3974187 100644 --- a/sys/x86/pci/pci_bus.c +++ b/sys/x86/pci/pci_bus.c @@ -625,6 +625,24 @@ legacy_pcib_release_resource(device_t dev, device_t child, int type, int rid, return (pci_domain_release_bus(0, child, rid, r)); return (bus_generic_release_resource(dev, child, type, rid, r)); } + +int +legacy_pcib_activate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + if (type == PCI_RES_BUS) + return (pci_domain_activate_bus(0, child, rid, r)); + return (bus_generic_activate_resource(dev, child, type, rid, r)); +} + +int +legacy_pcib_deactivate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + if (type == PCI_RES_BUS) + return (pci_domain_deactivate_bus(0, child, rid, r)); + return (bus_generic_deactivate_resource(dev, child, type, rid, r)); +} #endif static device_method_t legacy_pcib_methods[] = { @@ -643,12 +661,14 @@ static device_method_t legacy_pcib_methods[] = { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) DEVMETHOD(bus_adjust_resource, legacy_pcib_adjust_resource), DEVMETHOD(bus_release_resource, legacy_pcib_release_resource), + DEVMETHOD(bus_activate_resource, legacy_pcib_activate_resource), + DEVMETHOD(bus_deactivate_resource, legacy_pcib_deactivate_resource), #else DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), -#endif DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), +#endif DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), diff --git a/sys/x86/pci/qpi.c b/sys/x86/pci/qpi.c index 9b31d7693798..38eed7f67f80 100644 --- a/sys/x86/pci/qpi.c +++ b/sys/x86/pci/qpi.c @@ -284,12 +284,14 @@ static device_method_t qpi_pcib_methods[] = { DEVMETHOD(bus_alloc_resource, qpi_pcib_alloc_resource), DEVMETHOD(bus_adjust_resource, legacy_pcib_adjust_resource), DEVMETHOD(bus_release_resource, legacy_pcib_release_resource), + DEVMETHOD(bus_activate_resource, legacy_pcib_activate_resource), + DEVMETHOD(bus_deactivate_resource, legacy_pcib_deactivate_resource), #else DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), -#endif DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), +#endif DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), diff --git a/sys/x86/x86/mptable_pci.c b/sys/x86/x86/mptable_pci.c index 38a16673551f..5792b0cb7387 100644 --- a/sys/x86/x86/mptable_pci.c +++ b/sys/x86/x86/mptable_pci.c @@ -174,11 +174,13 @@ static device_method_t mptable_hostb_methods[] = { #endif #if defined(NEW_PCIB) && defined(PCI_RES_BUS) DEVMETHOD(bus_release_resource, legacy_pcib_release_resource), + DEVMETHOD(bus_activate_resource, legacy_pcib_activate_resource), + DEVMETHOD(bus_deactivate_resource, legacy_pcib_deactivate_resource), #else DEVMETHOD(bus_release_resource, bus_generic_release_resource), -#endif DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), +#endif DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), From nobody Tue Jan 23 17:45:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyn4bLFz57mmJ; Tue, 23 Jan 2024 17:45: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 4TKDyn0v9Tz476h; Tue, 23 Jan 2024 17:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxcwfBDTkC+POYvX0ZgzaiP0EFHhtTQ8bIsKTwD+3MY=; b=OBUM9N5zrOq3FQ7LopKIRBRs5e1P6P6RmDqBmTU9AIrcLD7+xGwT8fhk8iHy1jlWXBMkh9 mHCI3n52pU5HHVbix/RdR3gP7zJdqlq3EU/le2SqvETC6Zr8Kx8X+GHerwMA7Ez+SvT9Ii R3rS8U6sA7B3efhoFksPl9TvMkcLbqJaXVbMEoz9JQzkcL9FEWxIW0y4jUTJfBi7iKe+M5 L5tAssObkLMPDwQwBxQWteHmz9UC3NF2mbDf+Mv0WYVp0JUeibjL+5zzuGNOxqB+Bg1FRn nor1sFHKra7qfPApB4J8jgmJAjA/h8aF8AGAkgUV3D9dUMJKyaZINEr2VbNFVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxcwfBDTkC+POYvX0ZgzaiP0EFHhtTQ8bIsKTwD+3MY=; b=izn3e9lxFFsdkO4zDm47C/tEVZM7JamWI7GbTQ38rYMqGvV6YZhChD8rF6exe1nUIiuW1L BaqufqeNhx8F3QrCE7GlmR3HMYsjblar0ZMmK01pkyV42AsLiEhMafApVz4yWOhjFCAejX lAwrCTm1C9YH6uRzE5/qUhe+qt49Uz5K+DmCJ/hT1qtCRq2jqHj/SUgMqxnnV4p4ID2a9D LJgEZxHtjUKO+HlRv22BZ8w3dY6p0j09r3bPRtf9ljms6lmtrDkXLD758Clp6PXiJF1+I5 uzuhOALRGEJGQvbuHyzZHJ65p4ZpxJA+zGCO9R4OZ0wImDAyvQhMZhs8V/j/4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031953; a=rsa-sha256; cv=none; b=k4duUKtRYANVcFmJxwaA6U5zK7h+SI7KnLY4qyqjqmSNfFUwH1g9bv79TisuOC9/NFaSWE hhOcfm5pJ+/pkKL017LpTzpOFXKLDdgJSaf+i39VYXGTs75nDOr7qI2VTGxCc185LMRPKT G/qjSJxsIN0SSucstK7bWLQcj720/HkCtISq4pKa3+/Yios+idTGyU6Bq3fkxnjzjum0ws TJ2yPuKA0fbJPrz4bGyDcOEw1s3vY/+mXHDhTJBFSVdnJDTT3t0vuhx+bsYNNBDdZBsrgA Yen2EK4XCeLJdjANBlm0VGrZxoDhAjGXxOygEqMgtoSeG+Afvov0M+JslhmwVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyn00n9zgcM; Tue, 23 Jan 2024 17:45: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 40NHjqTn075706; Tue, 23 Jan 2024 17:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjqpu075703; Tue, 23 Jan 2024 17:45:52 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:52 GMT Message-Id: <202401231745.40NHjqpu075703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9c4effb1063d - main - hyperv vmbus_pcib: Use pci_domain_*_bus for PCI_RES_BUS resources List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c4effb1063d49748b4b7da4cc54f508ccad41fc Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9c4effb1063d49748b4b7da4cc54f508ccad41fc commit 9c4effb1063d49748b4b7da4cc54f508ccad41fc Author: John Baldwin AuthorDate: 2024-01-23 17:35:58 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:35:58 +0000 hyperv vmbus_pcib: Use pci_domain_*_bus for PCI_RES_BUS resources Specifically for bus_activate/adjust/deactivate_bus methods. Differential Revision: https://reviews.freebsd.org/D43431 --- sys/dev/hyperv/pcib/vmbus_pcib.c | 41 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/sys/dev/hyperv/pcib/vmbus_pcib.c b/sys/dev/hyperv/pcib/vmbus_pcib.c index ee7b82c10f23..f7c825d1bcf9 100644 --- a/sys/dev/hyperv/pcib/vmbus_pcib.c +++ b/sys/dev/hyperv/pcib/vmbus_pcib.c @@ -1711,6 +1711,18 @@ vmbus_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, return (res); } +static int +vmbus_pcib_adjust_resource(device_t dev, device_t child, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ + struct vmbus_pcib_softc *sc = device_get_softc(dev); + + if (type == PCI_RES_BUS) + return (pci_domain_adjust_bus(sc->hbus->pci_domain, child, r, + start, end)); + return (bus_generic_adjust_resource(dev, child, type, r, start, end)); +} + static int vmbus_pcib_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) @@ -1727,6 +1739,30 @@ vmbus_pcib_release_resource(device_t dev, device_t child, int type, int rid, return (bus_generic_release_resource(dev, child, type, rid, r)); } +static int +vmbus_pcib_activate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + struct vmbus_pcib_softc *sc = device_get_softc(dev); + + if (type == PCI_RES_BUS) + return (pci_domain_activate_bus(sc->hbus->pci_domain, child, + rid, r)); + return (bus_generic_activate_resource(dev, child, type, rid, r)); +} + +static int +vmbus_pcib_deactivate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + struct vmbus_pcib_softc *sc = device_get_softc(dev); + + if (type == PCI_RES_BUS) + return (pci_domain_deactivate_bus(sc->hbus->pci_domain, child, + rid, r)); + return (bus_generic_deactivate_resource(dev, child, type, rid, r)); +} + static int vmbus_pcib_get_cpus(device_t pcib, device_t dev, enum cpu_sets op, size_t setsize, cpuset_t *cpuset) @@ -1970,9 +2006,10 @@ static device_method_t vmbus_pcib_methods[] = { DEVMETHOD(bus_read_ivar, vmbus_pcib_read_ivar), DEVMETHOD(bus_write_ivar, vmbus_pcib_write_ivar), DEVMETHOD(bus_alloc_resource, vmbus_pcib_alloc_resource), + DEVMETHOD(bus_adjust_resource, vmbus_pcib_adjust_resource), DEVMETHOD(bus_release_resource, vmbus_pcib_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_activate_resource, vmbus_pcib_activate_resource), + DEVMETHOD(bus_deactivate_resource, vmbus_pcib_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_get_cpus, vmbus_pcib_get_cpus), From nobody Tue Jan 23 17:45:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyp3hMNz57mnv; Tue, 23 Jan 2024 17:45: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 4TKDyp1pWRz46xC; Tue, 23 Jan 2024 17:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CQH0nN24wQ66mEi0QEgkMHdXjOpj8L0xiM3yB7zDGs=; b=WezmPq4+yXE+6kgBj+9QM3Losprtm08dT26gLXBZfCMLJnLnvjL8c2YZJt8+0uzhxBXFDi 860sVYQkQy0yEIPFpVMpGI+CrIh02dkkVQyRv1PUHfHFvcaSK6EB8UOldSC50fU0p7kuwC bMr0tY76sfMfnk65IqSc3kqf/ZeFLEI8/T4V34qG6lowvxNkvIVCoQi0HNshifyuOWprHw 9P7bmF5zhvaEGk2ZPbuqOUh0Bi3lb4XjKIk3+4CRO/cNsx+gSu4tcY3GqtcKk37zRvCTuY 7vUhpG0YRRZvviHZshrGutVrPx4bBuKn7N0K5m5sWqbDTiPLjEECYv4ad4BnqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CQH0nN24wQ66mEi0QEgkMHdXjOpj8L0xiM3yB7zDGs=; b=SQTPJL/DhD9YsFe+3ohQ0Jf+6lIz4AYeegEv2Hckael36vmWIH71l4dqdkCCKx3w80RiqM DZd3Iv9Mw3738pgLYWgl8xZYyBwuUMdCme+cRQuJXHLrjlKMOucYmHNhjQFl8roFVFQUEh Sw6DCQ2fHNpnWCrAablAOvX2ieMJO2AwHjrIpvXdGP39fXSJ9j1pEdEwmFkJBgy4iaimU+ PJdnk/HxYy0J7Rxq5QY+8ttacn6gTM9t6x9RNryzWiEE5P5yBD7IdJRBOPqtBNms/573W2 LTwjqzLK0wfdwae8i12v8lHMQ94sk29l1m4KOQ9GjpheOCQihGEDrZ3tH7J1nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031954; a=rsa-sha256; cv=none; b=j9XmxISwhjjaOl4/EDDe5b3/+PzWctgZlHcxpHXgUile75YbmGZxFYmCbXwaNVEKZubHvC ahpuvb3hUnfsXOMYk0rx4NVsPg+WTGinK51UVwEdf+tLA0oQz3SFBGQ47tNc7nATAAn4J0 Vghuxgcyh7iTH1fKHf+qrdNZShUkiK0BhPDrcvwPeO3U78fZAqC1xIV9Vl60StpI/IGfOV E5H/CwwTvH4Qg58S3/gbZsJWDU183636FvLRYqMGd4rVuNigDgxYFEMiIr3EG851TG/3ac sg8c7hAKM7+Xl4t2/Gb3GhxqV9II/E67oUyTZyipB3k39kBZB13Zbb8H7tU2ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyp0vlfzfpQ; Tue, 23 Jan 2024 17:45:54 +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 40NHjsNN075745; Tue, 23 Jan 2024 17:45:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjssP075742; Tue, 23 Jan 2024 17:45:54 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:54 GMT Message-Id: <202401231745.40NHjssP075742@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3dd55df98282 - main - powerpc ps3bus: Use bus_generic_rman_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dd55df98282293c41bb0d98fa54312a9cf2aba5 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3dd55df98282293c41bb0d98fa54312a9cf2aba5 commit 3dd55df98282293c41bb0d98fa54312a9cf2aba5 Author: John Baldwin AuthorDate: 2024-01-23 17:36:12 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:36:12 +0000 powerpc ps3bus: Use bus_generic_rman_* - Split out part of ps3bus_activate_resource into a ps3bus_map_resource method. - Implement ps3bus_unmap_resource via pmap_unmapdev. - Use bus_generic_rman_* to add bus_adjust_resource, bus_deactivate_resource, and bus_release_resource methods. Reviewed by: imp, jhibbits Differential Revision: https://reviews.freebsd.org/D43432 --- sys/powerpc/ps3/ps3bus.c | 130 +++++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 56 deletions(-) diff --git a/sys/powerpc/ps3/ps3bus.c b/sys/powerpc/ps3/ps3bus.c index 64548e5a3b34..c3f46d4942ad 100644 --- a/sys/powerpc/ps3/ps3bus.c +++ b/sys/powerpc/ps3/ps3bus.c @@ -57,13 +57,18 @@ static int ps3bus_attach(device_t); static int ps3bus_print_child(device_t dev, device_t child); static int ps3bus_read_ivar(device_t bus, device_t child, int which, uintptr_t *result); +static struct rman *ps3bus_get_rman(device_t bus, int type, u_int flags); static struct resource *ps3bus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags); -static int ps3bus_activate_resource(device_t bus, device_t child, int type, - int rid, struct resource *res); +static int ps3bus_map_resource(device_t bus, device_t child, int type, + struct resource *r, struct resource_map_request *argsp, + struct resource_map *map); +static int ps3bus_unmap_resource(device_t bus, device_t child, int type, + struct resource *r, struct resource_map *map); static bus_dma_tag_t ps3bus_get_dma_tag(device_t dev, device_t child); -static int ps3_iommu_map(device_t dev, bus_dma_segment_t *segs, int *nsegs, bus_addr_t min, bus_addr_t max, bus_size_t alignment, +static int ps3_iommu_map(device_t dev, bus_dma_segment_t *segs, int *nsegs, + bus_addr_t min, bus_addr_t max, bus_size_t alignment, bus_addr_t boundary, void *cookie); static int ps3_iommu_unmap(device_t dev, bus_dma_segment_t *segs, int nsegs, void *cookie); @@ -109,8 +114,14 @@ static device_method_t ps3bus_methods[] = { DEVMETHOD(bus_get_dma_tag, ps3bus_get_dma_tag), DEVMETHOD(bus_print_child, ps3bus_print_child), DEVMETHOD(bus_read_ivar, ps3bus_read_ivar), + DEVMETHOD(bus_get_rman, ps3bus_get_rman), DEVMETHOD(bus_alloc_resource, ps3bus_alloc_resource), - DEVMETHOD(bus_activate_resource, ps3bus_activate_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_rman_adjust_resource), + DEVMETHOD(bus_activate_resource, bus_generic_rman_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_rman_deactivate_resource), + DEVMETHOD(bus_map_resource, ps3bus_map_resource), + DEVMETHOD(bus_unmap_resource, ps3bus_unmap_resource), + DEVMETHOD(bus_release_resource, bus_generic_rman_release_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -519,22 +530,31 @@ ps3bus_read_ivar(device_t bus, device_t child, int which, uintptr_t *result) return (0); } +static struct rman * +ps3bus_get_rman(device_t bus, int type, u_int flags) +{ + struct ps3bus_softc *sc; + + sc = device_get_softc(bus); + switch (type) { + case SYS_RES_MEMORY: + return (&sc->sc_mem_rman); + case SYS_RES_IRQ: + return (&sc->sc_intr_rman); + default: + return (NULL); + } +} + static struct resource * ps3bus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { struct ps3bus_devinfo *dinfo; - struct ps3bus_softc *sc; - int needactivate; - struct resource *rv; - struct rman *rm; rman_res_t adjstart, adjend, adjcount; struct resource_list_entry *rle; - sc = device_get_softc(bus); dinfo = device_get_ivars(child); - needactivate = flags & RF_ACTIVE; - flags &= ~RF_ACTIVE; switch (type) { case SYS_RES_MEMORY: @@ -561,13 +581,10 @@ ps3bus_alloc_resource(device_t bus, device_t child, int type, int *rid, adjend = end; adjcount = adjend - adjstart; - - rm = &sc->sc_mem_rman; break; case SYS_RES_IRQ: rle = resource_list_find(&dinfo->resources, SYS_RES_IRQ, *rid); - rm = &sc->sc_intr_rman; adjstart = rle->start; adjcount = ulmax(count, rle->count); adjend = ulmax(rle->end, rle->start + adjcount - 1); @@ -578,58 +595,59 @@ ps3bus_alloc_resource(device_t bus, device_t child, int type, int *rid, return (NULL); } - rv = rman_reserve_resource(rm, adjstart, adjend, adjcount, flags, - child); - if (rv == NULL) { - device_printf(bus, - "failed to reserve resource %#lx - %#lx (%#lx)" - " for %s\n", adjstart, adjend, adjcount, - device_get_nameunit(child)); - return (NULL); - } - - rman_set_rid(rv, *rid); - - if (needactivate) { - if (bus_activate_resource(child, type, *rid, rv) != 0) { - device_printf(bus, - "failed to activate resource for %s\n", - device_get_nameunit(child)); - rman_release_resource(rv); - return (NULL); - } - } - - return (rv); + return (bus_generic_rman_alloc_resource(bus, child, type, rid, adjstart, + adjend, adjcount, flags)); } static int -ps3bus_activate_resource(device_t bus, device_t child, int type, int rid, - struct resource *res) +ps3bus_map_resource(device_t bus, device_t child, int type, struct resource *r, + struct resource_map_request *argsp, struct resource_map *map) { - void *p; + struct resource_map_request args; + rman_res_t length, start; + int error; - if (type == SYS_RES_IRQ) - return (bus_activate_resource(bus, type, rid, res)); + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); - if (type == SYS_RES_MEMORY) { - vm_offset_t start; + /* Mappings are only supported on memory resources. */ + switch (type) { + case SYS_RES_MEMORY: + break; + default: + return (EINVAL); + } - start = (vm_offset_t) rman_get_start(res); + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); - if (bootverbose) - printf("ps3 mapdev: start %zx, len %ld\n", start, - rman_get_size(res)); + if (bootverbose) + printf("ps3 mapdev: start %jx, len %jd\n", start, length); - p = pmap_mapdev(start, (vm_size_t) rman_get_size(res)); - if (p == NULL) - return (ENOMEM); - rman_set_virtual(res, p); - rman_set_bustag(res, &bs_be_tag); - rman_set_bushandle(res, (rman_res_t)p); - } + map->r_vaddr = pmap_mapdev_attr(start, length, args.memattr); + if (map->r_vaddr == NULL) + return (ENOMEM); + map->r_bustag = &bs_be_tag; + map->r_bushandle = (vm_offset_t)map->r_vaddr; + map->r_size = length; + return (0); +} + +static int +ps3bus_unmap_resource(device_t bus, device_t child, int type, + struct resource *r, struct resource_map *map) +{ - return (rman_activate_resource(res)); + switch (type) { + case SYS_RES_MEMORY: + pmap_unmapdev(map->r_vaddr, map->r_size); + return (0); + default: + return (EINVAL); + } } static bus_dma_tag_t From nobody Tue Jan 23 17:45:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyq4VyXz57mYN; Tue, 23 Jan 2024 17:45: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 4TKDyq2tGyz472p; Tue, 23 Jan 2024 17:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhr6oa/xkA2e8drqxVPk5NHocnlCFVVws6S6dluZ/EE=; b=MzKZR3pVc9fa7mxhDDm7NvhYQOcKtimcqzQTbl7wieUyLjo7/29WaNQ6Dzl8jIf0hL8O1+ WpTbk9Emlz6QFdqQsyZ0gwRp0szj5Jtfa/yVMCGfAt/wJ8B+ljhqnAWLaavyvwldJO3rcx GY0cAxIVxZhCuhK8l6TS4p9NtIjcQf2d7MqXzjTIdgWALposxWzHW5HzeCZ382IUhjFlu0 08tqWJKO8O+sZbSd1/intQu/IoBEkP2sqVs10VkAISHVyEmHF7h8/cshIsMzIdvoR1kCP6 S1eRfaQP98IUi6aZDleHim7pHSe4yGd1wLvEqgNRg6gy/SJTq0m9pFKrKJptqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhr6oa/xkA2e8drqxVPk5NHocnlCFVVws6S6dluZ/EE=; b=BROkbAXBw6PmgoPpEWjD/x9AqfFhcf/Yj/RgQVV6sbrhSTSW/8kra5tNddRLsSNk0FkN13 tcvqFZ5PMYQG1x+HlfGZoEdphLxChQM1PZHkUEQ9yQ+hSmgRG/sTr9W0vw/DjR9w7T3akp CApP/n9uBS+rCyB4OKBpUE9YTZFLz7M6QYAUspz1hxiUPH+U0JwVZnFDATcDjH7ZyrOChc /YdoymSZ957q/RfQy0JKnI8eJBi/IG0ueaTHAeQxtwT5/6r/Sr8JLpZDqOfhL68OP1aPYK S9KiYfq1QO18Sl1Kskr0J90TkrJ7woDgpY8rfC6YYwhAXtRuCZgBXvvWtrEOSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031955; a=rsa-sha256; cv=none; b=kpe012YEk3yOrThliSBVDofAeJCEwlt3j4IIbEKsP4J3Oda7EkDcXYppn4g4Zhcc6kqm2q 08+qyDXrm3IG6sjWWRJSYrfgQm08As1GDGRWl4hE7jxTJe5WTvvMpl6io6+Z87RGJUxdnO mCUx1k+i6BHE/W0Qz0IKH3cEZ0KJ2OSg/2rYBjWsiHN4K1i6WADfCzh0l3YiLZoNKoIf81 9bsWDqjt1F8J6I1CnE+lgE1ro3RL4GTbK2NZZ6nSL0LPankNeIgya1DeyK8Pf7DxkG8LkF RsJOKN8sD1OuWMv1GuajXJy7zH9OmEFScLyVB8OOJ4W/v1U6mJU9eutYEXR/Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyq1xR2zgcN; Tue, 23 Jan 2024 17:45: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 40NHjtRd075790; Tue, 23 Jan 2024 17:45:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjtqZ075787; Tue, 23 Jan 2024 17:45:55 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:55 GMT Message-Id: <202401231745.40NHjtqZ075787@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d7c16b333455 - main - powerpc psim: Use bus_generic_rman_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7c16b333455faef4236d98bb6e671651e87a66d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d7c16b333455faef4236d98bb6e671651e87a66d commit d7c16b333455faef4236d98bb6e671651e87a66d Author: John Baldwin AuthorDate: 2024-01-23 17:36:26 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:36:26 +0000 powerpc psim: Use bus_generic_rman_* - Split out bits of iobus_activate/deactive_resource to implement iobus_map/unmap_resource. - Use bus_generic_rman_* methods in several bus methods to handle memory and I/O port resources. - Add an implementation of bus_adjust_resource. Reviewed by: imp, jhibbits Differential Revision: https://reviews.freebsd.org/D43433 --- sys/powerpc/psim/iobus.c | 183 +++++++++++++++++++++++++++++++---------------- 1 file changed, 123 insertions(+), 60 deletions(-) diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index 4ec0f1664e1c..497ef42d82e6 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -70,13 +70,21 @@ static int iobus_print_child(device_t dev, device_t child); static void iobus_probe_nomatch(device_t, device_t); static int iobus_read_ivar(device_t, device_t, int, uintptr_t *); static int iobus_write_ivar(device_t, device_t, int, uintptr_t); +static struct rman *iobus_get_rman(device_t, int, u_int); static struct resource *iobus_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); +static int iobus_adjust_resource(device_t, device_t, int, struct resource *, + rman_res_t, rman_res_t); static int iobus_activate_resource(device_t, device_t, int, int, struct resource *); static int iobus_deactivate_resource(device_t, device_t, int, int, struct resource *); +static int iobus_map_resource(device_t, device_t, int, struct resource *, + struct resource_map_request *, + struct resource_map *); +static int iobus_unmap_resource(device_t, device_t, int, struct resource *, + struct resource_map *); static int iobus_release_resource(device_t, device_t, int, int, struct resource *); @@ -100,10 +108,14 @@ static device_method_t iobus_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_get_rman, iobus_get_rman), DEVMETHOD(bus_alloc_resource, iobus_alloc_resource), + DEVMETHOD(bus_adjust_resource, iobus_adjust_resource), DEVMETHOD(bus_release_resource, iobus_release_resource), DEVMETHOD(bus_activate_resource, iobus_activate_resource), DEVMETHOD(bus_deactivate_resource, iobus_deactivate_resource), + DEVMETHOD(bus_map_resource, iobus_map_resource), + DEVMETHOD(bus_unmap_resource, iobus_unmap_resource), { 0, 0 } }; @@ -293,26 +305,32 @@ iobus_write_ivar(device_t dev, device_t child, int which, uintptr_t value) return (EINVAL); } -static struct resource * -iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, - rman_res_t start, rman_res_t end, rman_res_t count, - u_int flags) +static struct rman * +iobus_get_rman(device_t bus, int type, u_int flags) { struct iobus_softc *sc; - int needactivate; - struct resource *rv; - struct rman *rm; sc = device_get_softc(bus); + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (&sc->sc_mem_rman); + default: + return (NULL); + } +} - needactivate = flags & RF_ACTIVE; - flags &= ~RF_ACTIVE; +static struct resource * +iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, + rman_res_t start, rman_res_t end, rman_res_t count, + u_int flags) +{ switch (type) { case SYS_RES_MEMORY: case SYS_RES_IOPORT: - rm = &sc->sc_mem_rman; - break; + return (bus_generic_rman_alloc_resource(bus, child, type, rid, + start, end, count, flags)); case SYS_RES_IRQ: return (bus_alloc_resource(bus, type, rid, start, end, count, flags)); @@ -321,80 +339,125 @@ iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, device_get_nameunit(child)); return (NULL); } +} - rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == NULL) { - device_printf(bus, "failed to reserve resource for %s\n", - device_get_nameunit(child)); - return (NULL); - } - - rman_set_rid(rv, *rid); - - if (needactivate) { - if (bus_activate_resource(child, type, *rid, rv) != 0) { - device_printf(bus, - "failed to activate resource for %s\n", - device_get_nameunit(child)); - rman_release_resource(rv); - return (NULL); - } - } +static int +iobus_adjust_resource(device_t bus, device_t child, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ - return (rv); + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_adjust_resource(bus, child, type, r, + start, end)); + case SYS_RES_IRQ: + return (bus_adjust_resource(bus, type, r, start, end)); + default: + return (EINVAL); + } } static int iobus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - if (rman_get_flags(res) & RF_ACTIVE) { - int error = bus_deactivate_resource(child, type, rid, res); - if (error) - return error; - } - return (rman_release_resource(res)); + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_release_resource(bus, child, type, rid, + res)); + case SYS_RES_IRQ: + return (bus_release_resource(bus, type, rid, res)); + default: + return (EINVAL); + } } static int iobus_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - struct iobus_softc *sc; - void *p; - - sc = device_get_softc(bus); - if (type == SYS_RES_IRQ) + switch (type) { + case SYS_RES_IRQ: return (bus_activate_resource(bus, type, rid, res)); - - if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - p = pmap_mapdev((vm_paddr_t)rman_get_start(res) + sc->sc_addr, - (vm_size_t)rman_get_size(res)); - if (p == NULL) - return (ENOMEM); - rman_set_virtual(res, p); - rman_set_bustag(res, &bs_le_tag); - rman_set_bushandle(res, (u_long)p); + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_activate_resource(bus, child, type, + rid, res)); + default: + return (EINVAL); } - - return (rman_activate_resource(res)); } static int iobus_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - /* - * If this is a memory resource, unmap it. - */ - if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - u_int32_t psize; - psize = rman_get_size(res); - pmap_unmapdev(rman_get_virtual(res), psize); + switch (type) { + case SYS_RES_IRQ: + return (bus_deactivate_resource(bus, type, rid, res)); + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_deactivate_resource(bus, child, type, + rid, res)); + default: + return (EINVAL); } +} - return (rman_deactivate_resource(res)); +static int +iobus_map_resource(device_t bus, device_t child, int type, struct resource *r, + struct resource_map_request *argsp, struct resource_map *map) +{ + struct resource_map_request args; + struct iobus_softc *sc; + rman_res_t length, start; + int error; + + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); + + /* Mappings are only supported on I/O and memory resources. */ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + break; + default: + return (EINVAL); + } + + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); + + sc = device_get_softc(bus); + map->r_vaddr = pmap_mapdev_attr((vm_paddr_t)start + sc->sc_addr, + (vm_size_t)length, args.memattr); + if (map->r_vaddr == NULL) + return (ENOMEM); + map->r_bustag = &bs_le_tag; + map->r_bushandle = (vm_offset_t)map->r_vaddr; + map->r_size = length; + return (0); +} + +static int +iobus_unmap_resource(device_t bus, device_t child, int type, struct resource *r, + struct resource_map *map) +{ + + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + pmap_unmapdev(map->r_vaddr, map->r_size); + return (0); + default: + return (EINVAL); + } } From nobody Tue Jan 23 17:45:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDys0HX5z57mYX; Tue, 23 Jan 2024 17:45: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 4TKDyr3b9Sz47Cr; Tue, 23 Jan 2024 17:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QUYMPhjmJWrRW5O/VpWni2fKymBx7POBIrz3jtzv8R4=; b=wqf/WP9lWw98Uem4GADKW/HW6FQ5Bz5Dm9ahM8vpBwGWDv1HZxjBBhQV0EKTIl7saCIP5d t3Jq+zSRCqvo1ApqYgHi3X7xYVe+UMLoxbbH9d4z9tp9poZtooms1yKj9hAPgVOy1O15oe fSitzFHP71KPbin+rR/n+bG4KFj4trsB8iTq3mKfUOZxuDgHS7OS3Zrjy03K2lNmTVOBaN mG5ZTAt+8UE0XQWnBajKzfvCNbVM7F1Oh4sVngp+zYq2HbrOMQtXqhjdyA/S/rYHGbB5gI N2ebY/jYmPNMRMemNLGFEvNoeWJw6Ufwa39SHMLhOjoWQ2IZ5uqycbRlpHoikw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QUYMPhjmJWrRW5O/VpWni2fKymBx7POBIrz3jtzv8R4=; b=TJ5B3l96gHWY42QR6KR1Ud8+o9+RTJ3RDBB4mm5t6GbFMs0Nee7nv5J7UPGymoK0a2M6sW 6EPwEoLbeZfe77Beh2VVlyB3z5Lpmoo4Z6kP74QszPtMKZAN6cvyIzFWJYtpm7oNoPa0vO ZpCN5mmIAMNx5NptJ/W0N9Ay1kyAijt4sc66QOtapqAZEnETA01BwLwBKLSugp6+V18S6W BOqrGqNsQvX9bhf9zwJOPgtB7J4UsqomMduap7mgESGkcGu5Zadawu+/uj1MKOsWOiUwNB gA1CfofWrOs+CMGYwRBOrfFYvTESSQbJFCMDzIjPZ1OKj+DQuJEK8ENbP2wG6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031956; a=rsa-sha256; cv=none; b=ZqVvfDChc3oNPOaqPxiADJGIzRBeYZ+TPReRNqbarvU+4ZEpr9QtRI1T9wkv9gzgrspuqS HSwBRUwXKI+vOJUtV33q3B0CnOjzUlDNNP5wsG7kTRuUP4Sos17HAZJElJksSVHJXvreZL /ShqlCCZXgusq6ltKeIsGhlkBd3Gkj/NVO01PcZWW3cEYNXZs+jhdTbKDDnQ1a44EwJfFa +RY5+meARwe5OC3LSKu64hUmKnkH02/2ZovKtpVKIBOgnJVyvprCqBoZaELk9Oi5wG2mlz 9ZLVrJ+HTY3tNgG8sGb+E1UKFzODh3+bbKrD8kbqZzO74ykpd2d+pit9QwXHSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyr2gY3zfpR; Tue, 23 Jan 2024 17:45: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 40NHjuAZ075830; Tue, 23 Jan 2024 17:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjuu0075827; Tue, 23 Jan 2024 17:45:56 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:56 GMT Message-Id: <202401231745.40NHjuu0075827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5a7e717fb790 - main - powerpc mpc85xx: Use bus_generic_rman_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a7e717fb790842eddf766363d337ec879b3b513 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5a7e717fb790842eddf766363d337ec879b3b513 commit 5a7e717fb790842eddf766363d337ec879b3b513 Author: John Baldwin AuthorDate: 2024-01-23 17:36:37 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:36:37 +0000 powerpc mpc85xx: Use bus_generic_rman_* - Consistently map SYS_RES_IOPORT to SYS_RES_MEMORY for bus_activate/deactivate/adjust/release_resource. - Implement bus_map/unmap_resource. - Add an implementation of bus_adjust_resource. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D43434 --- sys/powerpc/mpc85xx/lbc.c | 185 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 137 insertions(+), 48 deletions(-) diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c index c07fa1251b2c..7db2d49955a3 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -69,13 +69,20 @@ static MALLOC_DEFINE(M_LBC, "localbus", "localbus devices information"); static int lbc_probe(device_t); static int lbc_attach(device_t); static int lbc_shutdown(device_t); -static int lbc_activate_resource(device_t bus __unused, device_t child __unused, - int type, int rid __unused, struct resource *r); -static int lbc_deactivate_resource(device_t bus __unused, - device_t child __unused, int type __unused, int rid __unused, +static int lbc_map_resource(device_t, device_t, int, struct resource *, + struct resource_map_request *, struct resource_map *); +static int lbc_unmap_resource(device_t, device_t, int, struct resource *, + struct resource_map *map); +static int lbc_activate_resource(device_t bus, device_t child, + int type, int rid, struct resource *r); +static int lbc_deactivate_resource(device_t bus, + device_t child, int type __unused, int rid, struct resource *r); +static struct rman *lbc_get_rman(device_t, int, u_int); static struct resource *lbc_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); +static int lbc_adjust_resource(device_t, device_t, int, struct resource *, + rman_res_t, rman_res_t); static int lbc_print_child(device_t, device_t); static int lbc_release_resource(device_t, device_t, int, int, struct resource *); @@ -95,10 +102,14 @@ static device_method_t lbc_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, NULL), + DEVMETHOD(bus_get_rman, lbc_get_rman), DEVMETHOD(bus_alloc_resource, lbc_alloc_resource), + DEVMETHOD(bus_adjust_resource, lbc_adjust_resource), DEVMETHOD(bus_release_resource, lbc_release_resource), DEVMETHOD(bus_activate_resource, lbc_activate_resource), DEVMETHOD(bus_deactivate_resource, lbc_deactivate_resource), + DEVMETHOD(bus_map_resource, lbc_map_resource), + DEVMETHOD(bus_unmap_resource, lbc_unmap_resource), /* OFW bus interface */ DEVMETHOD(ofw_bus_get_devinfo, lbc_get_devinfo), @@ -672,22 +683,31 @@ lbc_shutdown(device_t dev) return(0); } +static struct rman * +lbc_get_rman(device_t bus, int type, u_int flags) +{ + struct lbc_softc *sc; + + sc = device_get_softc(bus); + switch (type) { + case SYS_RES_MEMORY: + return (&sc->sc_rman); + default: + return (NULL); + } +} + static struct resource * lbc_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { - struct lbc_softc *sc; struct lbc_devinfo *di; struct resource_list_entry *rle; - struct resource *res; - struct rman *rm; - int needactivate; /* We only support default allocations. */ if (!RMAN_IS_DEFAULT_RANGE(start, end)) return (NULL); - sc = device_get_softc(bus); if (type == SYS_RES_IRQ) return (bus_alloc_resource(bus, type, rid, start, end, count, flags)); @@ -702,6 +722,10 @@ lbc_alloc_resource(device_t bus, device_t child, int type, int *rid, if (type == SYS_RES_IOPORT) type = SYS_RES_MEMORY; + /* + * XXX: We are supposed to return a value to the user, so this + * doesn't seem right. + */ rid = &di->di_bank; rle = resource_list_find(&di->di_res, type, *rid); @@ -714,32 +738,8 @@ lbc_alloc_resource(device_t bus, device_t child, int type, int *rid, count = rle->count; end = start + count - 1; - sc = device_get_softc(bus); - - needactivate = flags & RF_ACTIVE; - flags &= ~RF_ACTIVE; - - rm = &sc->sc_rman; - - res = rman_reserve_resource(rm, start, end, count, flags, child); - if (res == NULL) { - device_printf(bus, "failed to reserve resource %#jx - %#jx " - "(%#jx)\n", start, end, count); - return (NULL); - } - - rman_set_rid(res, *rid); - rman_set_bustag(res, &bs_be_tag); - rman_set_bushandle(res, rman_get_start(res)); - - if (needactivate) - if (bus_activate_resource(child, type, *rid, res)) { - device_printf(child, "resource activation failed\n"); - rman_release_resource(res); - return (NULL); - } - - return (res); + return (bus_generic_rman_alloc_resource(bus, child, type, rid, start, + end, count, flags)); } static int @@ -761,36 +761,125 @@ lbc_print_child(device_t dev, device_t child) return (rv); } +static int +lbc_adjust_resource(device_t dev, device_t child, int type, struct resource *r, + rman_res_t start, rman_res_t end) +{ + switch (type) { + case SYS_RES_IOPORT: + type = SYS_RES_MEMORY; + /* FALLTHROUGH */ + case SYS_RES_MEMORY: + return (bus_generic_rman_adjust_resource(dev, child, type, r, + start, end)); + case SYS_RES_IRQ: + return (bus_adjust_resource(dev, type, r, start, end)); + default: + return (EINVAL); + } +} + static int lbc_release_resource(device_t dev, device_t child, int type, int rid, struct resource *res) { - int err; + switch (type) { + case SYS_RES_IOPORT: + type = SYS_RES_MEMORY; + /* FALLTHROUGH */ + case SYS_RES_MEMORY: + return (bus_generic_rman_release_resource(dev, child, type, + rid, res)); + case SYS_RES_IRQ: + return (bus_release_resource(dev, type, rid, res)); + default: + return (EINVAL); + } +} - if (rman_get_flags(res) & RF_ACTIVE) { - err = bus_deactivate_resource(child, type, rid, res); - if (err) - return (err); +static int +lbc_activate_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + switch (type) { + case SYS_RES_IOPORT: + type = SYS_RES_MEMORY; + /* FALLTHROUGH */ + case SYS_RES_MEMORY: + return (bus_generic_rman_activate_resource(bus, child, type, + rid, r)); + case SYS_RES_IRQ: + return (bus_activate_resource(bus, type, rid, r)); + default: + return (EINVAL); } +} - return (rman_release_resource(res)); +static int +lbc_deactivate_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + switch (type) { + case SYS_RES_IOPORT: + type = SYS_RES_MEMORY; + /* FALLTHROUGH */ + case SYS_RES_MEMORY: + return (bus_generic_rman_deactivate_resource(bus, child, type, + rid, r)); + case SYS_RES_IRQ: + return (bus_deactivate_resource(bus, type, rid, r)); + default: + return (EINVAL); + } } static int -lbc_activate_resource(device_t bus __unused, device_t child __unused, - int type __unused, int rid __unused, struct resource *r) +lbc_map_resource(device_t bus, device_t child, int type, struct resource *r, + struct resource_map_request *argsp, struct resource_map *map) { + struct resource_map_request args; + rman_res_t length, start; + int error; + + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); + + /* Mappings are only supported on I/O and memory resources. */ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + break; + default: + return (EINVAL); + } + + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); - /* Child resources were already mapped, just activate. */ - return (rman_activate_resource(r)); + map->r_bustag = &bs_be_tag; + map->r_bushandle = start; + map->r_size = length; + map->r_vaddr = NULL; + return (0); } static int -lbc_deactivate_resource(device_t bus __unused, device_t child __unused, - int type __unused, int rid __unused, struct resource *r) +lbc_unmap_resource(device_t bus, device_t child, int type, struct resource *r, + struct resource_map *map) { - return (rman_deactivate_resource(r)); + /* Mappings are only supported on I/O and memory resources. */ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + break; + default: + return (EINVAL); + } + return (0); } static const struct ofw_bus_devinfo * From nobody Tue Jan 23 17:45:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDys65mBz57mT2; Tue, 23 Jan 2024 17:45: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 4TKDys4pJcz47M4; Tue, 23 Jan 2024 17:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWMLzpdOzLdmQpht4Y6hLByhpByve2qLito6xZX13Lw=; b=kbYio/9//dge64XYSFD/v6TTEzNIoIrHa2zOrWy+7zvMxr+5mBylhLJaDGsM2jMghnWkmt aTseydknypfLzFHac9/xRM50GStPCxvjANVL7mPzaNRCvVRs03kkZmp6rzotHADw7zWjAw wMm3maD2Er4dhicH/iJ9sBxp4Rdkm0mKM5CNtSqQzYIRJJ3HM2ek2eoRiy0Y0q7NfnKF93 dPmjp6Ghaq/aFQzFXHel0sE/JFt+A4XVA1X0eQGUM0UPPjyxGltjpkPtTknCp4EWpyfuCO MtGr7XugLF3DXGULIEreRjYbS07TaMeeOS5+IpWpVqKiA7DeB++LeuZ2M2Jpcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWMLzpdOzLdmQpht4Y6hLByhpByve2qLito6xZX13Lw=; b=UYtbXFrxTLgFK+6s6DHNP29ufWBUXVzfp71DvlA0p7x0cwvwheVxImXJ0Uu+jJTvveWMnD o783PjFhwxhZhO519OSkRAdZ9UCknPGunDVdt2ftWzhhA1eCgPVOR0Yt0lGXPWqNja3ICU gLEJH69C/qcdRr8Lc/aBE2Mci3At6K4eBeqbVwytT1kRKzXhu++Qjcxg+LWdtzhAATrIV1 21sQD5wxqO7hxpHQ6Il9TUd4G7GNsieoBE/To3JitN5SJ4EG0pc4UQrBE2ng7eH5/wkbHT v2c5NGrK3q1dffzBwWvyv6rw1N0bRKpM1NTr7sfoX86xpnbmP22EEICk7aDVog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031957; a=rsa-sha256; cv=none; b=sq4YAO+QQas6jrYrDwqlT61p1x8a8VyF3wfmWfZA2UGssNRd7rV26aNb909M9TXtITys4W XFCcJ2OvBMgg5nwwLHjJomYcj2tlkEQAb4J1JNeNGoVY4//YlE3NnLrMKo/4b0YXBu0TFe trlInomS668QtQRgIHEglLkIPv5iHEARwGAgUrS5yI76+PHCU326EjcmNawpdN2nXrM2qY BVTxmPMhsCyIMGINZhbF/uv0AUAJ0XNJpsgHzE8KbW6uH4oZki29x5LYrZSbcJclTh/b04 RWpnT2yO2mHYlQ+UtdgSKRnzbrygk4wejvY/DgRXWbP3923Igt8BSjquF6T+cA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDys3YxPzg0k; Tue, 23 Jan 2024 17:45: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 40NHjvxt075877; Tue, 23 Jan 2024 17:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjvRR075874; Tue, 23 Jan 2024 17:45:57 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:57 GMT Message-Id: <202401231745.40NHjvRR075874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: af081ec6f7cf - main - powerpc powermac: Use bus_generic_rman_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af081ec6f7cf4b764a1b417135440cf05cf1a174 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=af081ec6f7cf4b764a1b417135440cf05cf1a174 commit af081ec6f7cf4b764a1b417135440cf05cf1a174 Author: John Baldwin AuthorDate: 2024-01-23 17:36:49 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:36:49 +0000 powerpc powermac: Use bus_generic_rman_* Implement bus_map/unmap_resource and add bus_get_rman for use by bus_generic_rman_*. Reviewed by: imp, jhibbits Differential Revision: https://reviews.freebsd.org/D43435 --- sys/powerpc/powermac/macio.c | 197 ++++++++++++++++++++++++++------------- sys/powerpc/powermac/uninorth.c | 200 ++++++++++++++++++++++++++-------------- 2 files changed, 264 insertions(+), 133 deletions(-) diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c index 76ae844e50fe..f6ad815064e8 100644 --- a/sys/powerpc/powermac/macio.c +++ b/sys/powerpc/powermac/macio.c @@ -80,15 +80,23 @@ static int macio_probe(device_t); static int macio_attach(device_t); static int macio_print_child(device_t dev, device_t child); static void macio_probe_nomatch(device_t, device_t); +static struct rman *macio_get_rman(device_t, int, u_int); static struct resource *macio_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); +static int macio_adjust_resource(device_t, device_t, int, struct resource *, + rman_res_t, rman_res_t); static int macio_activate_resource(device_t, device_t, int, int, struct resource *); static int macio_deactivate_resource(device_t, device_t, int, int, struct resource *); static int macio_release_resource(device_t, device_t, int, int, struct resource *); +static int macio_map_resource(device_t, device_t, int, struct resource *, + struct resource_map_request *, + struct resource_map *); +static int macio_unmap_resource(device_t, device_t, int, struct resource *, + struct resource_map *); static struct resource_list *macio_get_resource_list (device_t, device_t); static ofw_bus_get_devinfo_t macio_get_devinfo; #if !defined(__powerpc64__) && defined(SMP) @@ -113,10 +121,14 @@ static device_method_t macio_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_get_rman, macio_get_rman), DEVMETHOD(bus_alloc_resource, macio_alloc_resource), + DEVMETHOD(bus_adjust_resource, macio_adjust_resource), DEVMETHOD(bus_release_resource, macio_release_resource), DEVMETHOD(bus_activate_resource, macio_activate_resource), DEVMETHOD(bus_deactivate_resource, macio_deactivate_resource), + DEVMETHOD(bus_map_resource, macio_map_resource), + DEVMETHOD(bus_unmap_resource, macio_unmap_resource), DEVMETHOD(bus_get_resource_list, macio_get_resource_list), DEVMETHOD(bus_child_pnpinfo, ofw_bus_gen_child_pnpinfo), @@ -495,25 +507,32 @@ macio_probe_nomatch(device_t dev, device_t child) } } +static struct rman * +macio_get_rman(device_t bus, int type, u_int flags) +{ + struct macio_softc *sc; + + sc = device_get_softc(bus); + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (&sc->sc_mem_rman); + default: + return (NULL); + } +} + static struct resource * macio_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { - struct macio_softc *sc; - int needactivate; - struct resource *rv; - struct rman *rm; - u_long adjstart, adjend, adjcount; + rman_res_t adjstart, adjend, adjcount; struct macio_devinfo *dinfo; struct resource_list_entry *rle; - sc = device_get_softc(bus); dinfo = device_get_ivars(child); - needactivate = flags & RF_ACTIVE; - flags &= ~RF_ACTIVE; - switch (type) { case SYS_RES_MEMORY: case SYS_RES_IOPORT: @@ -541,8 +560,8 @@ macio_alloc_resource(device_t bus, device_t child, int type, int *rid, adjcount = adjend - adjstart; - rm = &sc->sc_mem_rman; - break; + return (bus_generic_rman_alloc_resource(bus, child, type, rid, + adjstart, adjend, adjcount, flags)); case SYS_RES_IRQ: /* Check for passthrough from subattachments like macgpio */ @@ -574,84 +593,134 @@ macio_alloc_resource(device_t bus, device_t child, int type, int *rid, device_get_nameunit(child)); return (NULL); } +} - rv = rman_reserve_resource(rm, adjstart, adjend, adjcount, flags, - child); - if (rv == NULL) { - device_printf(bus, - "failed to reserve resource %#lx - %#lx (%#lx) for %s\n", - adjstart, adjend, adjcount, device_get_nameunit(child)); - return (NULL); +static int +macio_adjust_resource(device_t bus, device_t child, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_adjust_resource(bus, child, type, r, + start, end)); + case SYS_RES_IRQ: + return (bus_generic_adjust_resource(bus, child, type, r, start, + end)); + default: + return (EINVAL); } - - rman_set_rid(rv, *rid); - - if (needactivate) { - if (bus_activate_resource(child, type, *rid, rv) != 0) { - device_printf(bus, - "failed to activate resource for %s\n", - device_get_nameunit(child)); - rman_release_resource(rv); - return (NULL); - } - } - - return (rv); } static int macio_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - if (rman_get_flags(res) & RF_ACTIVE) { - int error = bus_deactivate_resource(child, type, rid, res); - if (error) - return error; + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_release_resource(bus, child, type, rid, + res)); + case SYS_RES_IRQ: + return (bus_generic_rl_release_resource(bus, child, type, rid, + res)); + default: + return (EINVAL); } - - return (rman_release_resource(res)); } static int macio_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - struct macio_softc *sc; - void *p; - - sc = device_get_softc(bus); - - if (type == SYS_RES_IRQ) - return (bus_activate_resource(bus, type, rid, res)); - - if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - p = pmap_mapdev((vm_paddr_t)rman_get_start(res) + sc->sc_base, - (vm_size_t)rman_get_size(res)); - if (p == NULL) - return (ENOMEM); - rman_set_virtual(res, p); - rman_set_bustag(res, &bs_le_tag); - rman_set_bushandle(res, (u_long)p); + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_activate_resource(bus, child, type, + rid, res)); + case SYS_RES_IRQ: + return (bus_generic_activate_resource(bus, child, type, rid, + res)); + default: + return (EINVAL); } - - return (rman_activate_resource(res)); } static int macio_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - /* - * If this is a memory resource, unmap it. - */ - if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - u_int32_t psize; + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_deactivate_resource(bus, child, type, + rid, res)); + case SYS_RES_IRQ: + return (bus_generic_deactivate_resource(bus, child, type, rid, + res)); + default: + return (EINVAL); + } +} + +static int +macio_map_resource(device_t bus, device_t child, int type, + struct resource *r, struct resource_map_request *argsp, + struct resource_map *map) +{ + struct resource_map_request args; + struct macio_softc *sc; + rman_res_t length, start; + int error; + + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); - psize = rman_get_size(res); - pmap_unmapdev(rman_get_virtual(res), psize); + /* Mappings are only supported on I/O and memory resources. */ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + break; + default: + return (EINVAL); } - return (rman_deactivate_resource(res)); + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); + + if (bootverbose) + printf("nexus mapdev: start %jx, len %jd\n", + (uintmax_t)start, (uintmax_t)length); + + sc = device_get_softc(bus); + map->r_vaddr = pmap_mapdev_attr((vm_paddr_t)start + sc->sc_base, + length, args.memattr); + if (map->r_vaddr == NULL) + return (ENOMEM); + map->r_bustag = &bs_le_tag; + map->r_bushandle = (bus_space_handle_t)map->r_vaddr; + return (0); +} + +static int +macio_unmap_resource(device_t bus, device_t child, int type, + struct resource *r, struct resource_map *map) +{ + /* + * If this is a memory resource, unmap it. + */ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + pmap_unmapdev(map->r_vaddr, map->r_size); + break; + default: + return (EINVAL); + } + return (0); } static struct resource_list * diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c index 1e22e0f92855..b64bbc8ade62 100644 --- a/sys/powerpc/powermac/uninorth.c +++ b/sys/powerpc/powermac/uninorth.c @@ -71,13 +71,22 @@ static int unin_chip_attach(device_t); */ static int unin_chip_print_child(device_t dev, device_t child); static void unin_chip_probe_nomatch(device_t, device_t); +static struct rman *unin_chip_get_rman(device_t, int, u_int); static struct resource *unin_chip_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); +static int unin_chip_adjust_resource(device_t, device_t, int, + struct resource *, rman_res_t, + rman_res_t); static int unin_chip_activate_resource(device_t, device_t, int, int, struct resource *); static int unin_chip_deactivate_resource(device_t, device_t, int, int, struct resource *); +static int unin_chip_map_resource(device_t, device_t, int, struct resource *, + struct resource_map_request *, + struct resource_map *); +static int unin_chip_unmap_resource(device_t, device_t, int, struct resource *, + struct resource_map *); static int unin_chip_release_resource(device_t, device_t, int, int, struct resource *); static struct resource_list *unin_chip_get_resource_list (device_t, device_t); @@ -109,10 +118,14 @@ static device_method_t unin_chip_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_get_rman, unin_chip_get_rman), DEVMETHOD(bus_alloc_resource, unin_chip_alloc_resource), + DEVMETHOD(bus_adjust_resource, unin_chip_adjust_resource), DEVMETHOD(bus_release_resource, unin_chip_release_resource), DEVMETHOD(bus_activate_resource, unin_chip_activate_resource), DEVMETHOD(bus_deactivate_resource, unin_chip_deactivate_resource), + DEVMETHOD(bus_map_resource, unin_chip_map_resource), + DEVMETHOD(bus_unmap_resource, unin_chip_unmap_resource), DEVMETHOD(bus_get_resource_list, unin_chip_get_resource_list), DEVMETHOD(bus_child_pnpinfo, ofw_bus_gen_child_pnpinfo), @@ -449,25 +462,32 @@ unin_chip_probe_nomatch(device_t dev, device_t child) } } +static struct rman * +unin_chip_get_rman(device_t bus, int type, u_int flags) +{ + struct unin_chip_softc *sc; + + sc = device_get_softc(bus); + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (&sc->sc_mem_rman); + default: + return (NULL); + } +} + static struct resource * unin_chip_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { - struct unin_chip_softc *sc; - int needactivate; - struct resource *rv; - struct rman *rm; - u_long adjstart, adjend, adjcount; + rman_res_t adjstart, adjend, adjcount; struct unin_chip_devinfo *dinfo; struct resource_list_entry *rle; - sc = device_get_softc(bus); dinfo = device_get_ivars(child); - needactivate = flags & RF_ACTIVE; - flags &= ~RF_ACTIVE; - switch (type) { case SYS_RES_MEMORY: case SYS_RES_IOPORT: @@ -497,9 +517,8 @@ unin_chip_alloc_resource(device_t bus, device_t child, int type, int *rid, adjcount = adjend - adjstart; - rm = &sc->sc_mem_rman; - break; - + return (bus_generic_rman_alloc_resource(bus, child, + SYS_RES_MEMORY, rid, adjstart, adjend, adjcount, flags)); case SYS_RES_IRQ: /* Check for passthrough from subattachments. */ if (device_get_parent(child) != bus) @@ -532,89 +551,132 @@ unin_chip_alloc_resource(device_t bus, device_t child, int type, int *rid, device_get_nameunit(child)); return (NULL); } +} - rv = rman_reserve_resource(rm, adjstart, adjend, adjcount, flags, - child); - if (rv == NULL) { - device_printf(bus, - "failed to reserve resource %#lx - %#lx (%#lx)" - " for %s\n", adjstart, adjend, adjcount, - device_get_nameunit(child)); - return (NULL); +static int +unin_chip_adjust_resource(device_t bus, device_t child, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_adjust_resource(bus, child, type, r, + start, end)); + case SYS_RES_IRQ: + return (bus_generic_adjust_resource(bus, child, type, r, start, + end)); + default: + return (EINVAL); } - - rman_set_rid(rv, *rid); - - if (needactivate) { - if (bus_activate_resource(child, type, *rid, rv) != 0) { - device_printf(bus, - "failed to activate resource for %s\n", - device_get_nameunit(child)); - rman_release_resource(rv); - return (NULL); - } - } - - return (rv); } static int unin_chip_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - if (rman_get_flags(res) & RF_ACTIVE) { - int error = bus_deactivate_resource(child, type, rid, res); - if (error) - return error; + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_release_resource(bus, child, type, rid, + res)); + case SYS_RES_IRQ: + return (bus_generic_rl_release_resource(bus, child, type, rid, + res)); + default: + return (EINVAL); } - - return (rman_release_resource(res)); } static int unin_chip_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - void *p; - - if (type == SYS_RES_IRQ) - return (bus_activate_resource(bus, type, rid, res)); + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_activate_resource(bus, child, type, + rid, res)); + case SYS_RES_IRQ: + return (bus_generic_activate_resource(bus, child, type, rid, + res)); + default: + return (EINVAL); + } +} - if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - vm_offset_t start; +static int +unin_chip_deactivate_resource(device_t bus, device_t child, int type, int rid, + struct resource *res) +{ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_deactivate_resource(bus, child, type, + rid, res)); + case SYS_RES_IRQ: + return (bus_generic_deactivate_resource(bus, child, type, rid, + res)); + default: + return (EINVAL); + } +} - start = (vm_offset_t) rman_get_start(res); +static int +unin_chip_map_resource(device_t bus, device_t child, int type, + struct resource *r, struct resource_map_request *argsp, + struct resource_map *map) +{ + struct resource_map_request args; + rman_res_t length, start; + int error; - if (bootverbose) - printf("unin mapdev: start %zx, len %jd\n", start, - rman_get_size(res)); + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); - p = pmap_mapdev(start, (vm_size_t) rman_get_size(res)); - if (p == NULL) - return (ENOMEM); - rman_set_virtual(res, p); - rman_set_bustag(res, &bs_be_tag); - rman_set_bushandle(res, (u_long)p); + /* Mappings are only supported on I/O and memory resources. */ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + break; + default: + return (EINVAL); } - return (rman_activate_resource(res)); + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); + + if (bootverbose) + printf("nexus mapdev: start %jx, len %jd\n", + (uintmax_t)start, (uintmax_t)length); + + map->r_vaddr = pmap_mapdev_attr(start, length, args.memattr); + if (map->r_vaddr == NULL) + return (ENOMEM); + map->r_bustag = &bs_be_tag; + map->r_size = length; + map->r_bushandle = (bus_space_handle_t)map->r_vaddr; + return (0); } static int -unin_chip_deactivate_resource(device_t bus, device_t child, int type, int rid, - struct resource *res) +unin_chip_unmap_resource(device_t bus, device_t child, int type, + struct resource *r, struct resource_map *map) { - /* - * If this is a memory resource, unmap it. - */ - if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - u_int32_t psize; - - psize = rman_get_size(res); - pmap_unmapdev(rman_get_virtual(res), psize); + /* + * If this is a memory resource, unmap it. + */ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + pmap_unmapdev(map->r_vaddr, map->r_size); + break; + default: + return (EINVAL); } - - return (rman_deactivate_resource(res)); + return (0); } static struct resource_list * From nobody Tue Jan 23 17:45:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyv17H8z57mYb; Tue, 23 Jan 2024 17:45: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 4TKDyt55Hkz47Bt; Tue, 23 Jan 2024 17:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HKZl+ex1tIJ+svVANHWCh4NPue3WlUKEghgAD4DyUOU=; b=MSxnY7Hobjf0z7yQAFmNeoGn+7/pc/nY3og+H7EcPoam1x3v6h9VwWeXsiUIMBIBCE+T3O hYzzlP7ZSDijREZoEV4ZaS4ybjjgTr1SmvTW4/3uvOY5ZR6Ge8lOTi8ibPLMCqQiL2kM0P ktLc8oQOBcx/rHi4tDWkT4ZjkPQ++e1eLVZI9mmq+r8xeatU3KxQgkwJ3BPt4i+D46TyJS qVl0rI80r0IjbtjTYmjlK0fs6AzjSsHAc44zltRRkTV50y+P5VaWtzfVA4xAz1ZtO4ECTe XPPTdTyIrExtDAx4+OeSoXWng8fVK3dSdxz4SWIGakzHGSpVN/K9Fj7UoPkTxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HKZl+ex1tIJ+svVANHWCh4NPue3WlUKEghgAD4DyUOU=; b=Hh4upiEcdej5obOdoPfMzBTAi26nUNMKqiK4upeO/dUdMX+6xbLCJMuq4Cx6OB+/AOxuGU V8AbikewDM7QeEpSi+6vftYV4Vj6Q77W8ltMi+vVliyvr8S/LdvpAnMNK9zTcLLITEmaW/ dfs/YYGdg/iXFVW/hnVSfbw4XNeEAIB6/yXs8NKqR5FL4xSowe5uVb8pP0gMomaUP9KvVh qVDKYwaJMTXscX8WY884wTblplZX/zH9V1b2da2Cesn9cTJ/zQMaYW4b9c42lA0+xXRNs0 D6Y4OJnXwka0VKyy2+30ny0NCK3p/hk7OPvTVkc0tAa3ZfqQLV2/5HPFZHBtvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031958; a=rsa-sha256; cv=none; b=GrDE3R9w1r29ACFJOzsxUkRA5LlwGnue4Ml0erb6k3Xd/0qCoETtaS2ETGezPaRoCkYcZG AwnkUXZoeRx/ZCuR0cfZojcYwbqe9PlKQ1NNRus7l/xGVG2NpzetzAUEL636syAHi36epw yu9d0J0201fjwJX5DkOSV3/0g4sYrRRGO7DRL1ZBHkrJAtDKKLxXEfRNhkWsOAKj8j6IP4 JHkvz4KnigdkFc9jfZ37MUMbuzzl6wYo9lmWfjsRmMZIVzfmEZpvM+Mn76oLrZcIvT77VH jrNjxi4aosYvHRnUJbh4v+vSntXOplA9NzlzRiEL5Qbd4yZO+64fZ9VafNUZeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyt4B2HzfyB; Tue, 23 Jan 2024 17:45: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 40NHjwXV075918; Tue, 23 Jan 2024 17:45:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjwg0075915; Tue, 23 Jan 2024 17:45:58 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:58 GMT Message-Id: <202401231745.40NHjwg0075915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7b5a5e4eef50 - main - powerpc nexus: Use bus_generic_rman_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b5a5e4eef504d2972b6b5f6abfff8058be6371e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7b5a5e4eef504d2972b6b5f6abfff8058be6371e commit 7b5a5e4eef504d2972b6b5f6abfff8058be6371e Author: John Baldwin AuthorDate: 2024-01-23 17:37:02 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:37:02 +0000 powerpc nexus: Use bus_generic_rman_* Reviewed by: imp, jhibbits Differential Revision: https://reviews.freebsd.org/D43436 --- sys/powerpc/powerpc/nexus.c | 129 ++++---------------------------------------- 1 file changed, 11 insertions(+), 118 deletions(-) diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index b9c2755dd983..3c71e1e79e3b 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -67,12 +67,8 @@ static struct rman mem_rman; static device_probe_t nexus_probe; static device_attach_t nexus_attach; -static bus_activate_resource_t nexus_activate_resource; -static bus_adjust_resource_t nexus_adjust_resource; -static bus_alloc_resource_t nexus_alloc_resource; -static bus_deactivate_resource_t nexus_deactivate_resource; +static bus_get_rman_t nexus_get_rman; static bus_map_resource_t nexus_map_resource; -static bus_release_resource_t nexus_release_resource; static bus_unmap_resource_t nexus_unmap_resource; #ifdef SMP @@ -93,12 +89,13 @@ static device_method_t nexus_methods[] = { /* Bus interface */ DEVMETHOD(bus_add_child, bus_generic_add_child), - DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), - DEVMETHOD(bus_activate_resource, nexus_activate_resource), - DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), - DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_rman_adjust_resource), + DEVMETHOD(bus_activate_resource, bus_generic_rman_activate_resource), + DEVMETHOD(bus_alloc_resource, bus_generic_rman_alloc_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_rman_deactivate_resource), + DEVMETHOD(bus_get_rman, nexus_get_rman), DEVMETHOD(bus_map_resource, nexus_map_resource), - DEVMETHOD(bus_release_resource, nexus_release_resource), + DEVMETHOD(bus_release_resource, bus_generic_rman_release_resource), DEVMETHOD(bus_unmap_resource, nexus_unmap_resource), #ifdef SMP DEVMETHOD(bus_bind_intr, nexus_bind_intr), @@ -231,121 +228,17 @@ nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells, return (intr); } -/* - * Allocate a resource on behalf of child. NB: child is usually going to be a - * child of one of our descendants, not a direct child of nexus0. - */ -static struct resource * -nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, - rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) +static struct rman * +nexus_get_rman(device_t bus, int type, u_int flags) { - struct rman *rm; - struct resource *rv; - switch (type) { case SYS_RES_IRQ: - rm = &intr_rman; - break; + return (&intr_rman); case SYS_RES_MEMORY: - rm = &mem_rman; - break; + return (&mem_rman); default: return (NULL); } - - rv = rman_reserve_resource(rm, start, end, count, flags & ~RF_ACTIVE, - child); - if (rv == NULL) - return (NULL); - rman_set_rid(rv, *rid); - - if ((flags & RF_ACTIVE) != 0) { - if (bus_activate_resource(child, type, *rid, rv) != 0) { - rman_release_resource(rv); - return (NULL); - } - } - - return (rv); -} - -static int -nexus_activate_resource(device_t bus __unused, device_t child __unused, - int type, int rid __unused, struct resource *r) -{ - - if (type == SYS_RES_MEMORY) { - vm_paddr_t start; - void *p; - - start = (vm_paddr_t) rman_get_start(r); - if (bootverbose) - printf("nexus mapdev: start %jx, len %jd\n", - (uintmax_t)start, rman_get_size(r)); - - p = pmap_mapdev(start, (vm_size_t) rman_get_size(r)); - if (p == NULL) - return (ENOMEM); - rman_set_virtual(r, p); - rman_set_bustag(r, &bs_be_tag); - rman_set_bushandle(r, (u_long)p); - } - return (rman_activate_resource(r)); -} - -static int -nexus_deactivate_resource(device_t bus __unused, device_t child __unused, - int type __unused, int rid __unused, struct resource *r) -{ - - /* - * If this is a memory resource, unmap it. - */ - if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - bus_size_t psize; - - psize = rman_get_size(r); - pmap_unmapdev(rman_get_virtual(r), psize); - } - - return (rman_deactivate_resource(r)); -} - -static int -nexus_adjust_resource(device_t bus, device_t child __unused, int type, - struct resource *r, rman_res_t start, rman_res_t end) -{ - struct rman *rm; - - switch (type) { - case SYS_RES_IRQ: - rm = &intr_rman; - break; - case SYS_RES_MEMORY: - rm = &mem_rman; - break; - default: - return (EINVAL); - } - if (rm == NULL) - return (ENXIO); - if (rman_is_region_manager(r, rm) == 0) - return (EINVAL); - return (rman_adjust_resource(r, start, end)); -} - -static int -nexus_release_resource(device_t bus, device_t child, int type, - int rid, struct resource *r) -{ - int error; - - if ((rman_get_flags(r) & RF_ACTIVE) != 0) { - error = bus_deactivate_resource(child, type, rid, r); - if (error) - return (error); - } - return (rman_release_resource(r)); } static int From nobody Tue Jan 23 17:45:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyw0BYnz57mxY; Tue, 23 Jan 2024 17:46: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 4TKDyv5hlVz475c; Tue, 23 Jan 2024 17:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jvQmGHgn33IQfoP7U3nyzVFtrfi+9xbSg4xC5EVo5I=; b=LfGMaEoTESAFDKalV4s2IrQ1sjSO4sVWANjFv5vkfYwjGnwHssiPmtToRBAFdbTJUn4PEJ dkTcYni/0om1+kUhVPlonsbz1yGiKkU651aIyPRlQR5haIJ584/WIyCquPJU91iVANSUlp RSSi/junBhvbLFBX1+58xIgvvjSlln/50YuyFCwpTlA0SXqZrLvmu2jcmy3fUgJMkQtXwL ps/Or5+uCfAKktIi5ex+uvAeZqlv6fUXU3VgckV6lx51v0eA7SUwGppI5HjUMtbMDN2QOX PeJThxC9ZwdM8yo7t2lhAW37VTW+VOYLE5WwZSdA0frv4CWMjLY3zR8bRCxKAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jvQmGHgn33IQfoP7U3nyzVFtrfi+9xbSg4xC5EVo5I=; b=mL6IiSf8emjaAkh+G/VNocqH2jJ8JgnTDc4GDZpd1Qt6jKTErAdaxGWWtSrnPVbbksGOfO GwUINEkAXiqYZFHbIhvMJgjDmAp7IUcHjReDY7m61Co3Be5SrTwU0amcpwC59xk8v6kKGG IYCMR2RRu9AZtkURegPZ/nlJr9YktU+8L1yfBFDgFzoy5f6I2hduVSpr4UWYWBa/CdDtM0 g9HSYlBjjHU5HQOPeA8INqHhBYpy0AGt4XIc0ygCqj7kCJ2ML0OjGcBypFfIBpO6YzVJ/b CxY236lHW4yh6rXhv6kZbyFeuV4YorTQgV/krOJHLU5O5HsV4SjuGZAqViT9kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031959; a=rsa-sha256; cv=none; b=KvzAT+Cz5rjsGk1zBJabrefRzdyPsEKk6tS7sPph42LzoPwWbm/4PNdo5io7ct6Uwz7gLV 9VKfiV9UvnGz/q0U/xc7fEpES8JcZfMHmFw6eTgTgzmui8Bt5c4ZVM/JqlydKd8OWQugOX EjTSGsQ7yKvfBD+gCAJch0Oj2Vl3h0RSxHGZtrTbCbMOb5GNkIOR2wPkT/uhmHgvWMbOKj hELLKHVCfzEk3+Ci1HyzlpnWJwYb1Jd4U5/N+TY97zCcRznD208q1eKR4/b9PzoDzJYm4b I3m06VdE6ayM77JyxZ8NufMED91l61KCuo+bdJX+4TcoBksg2hRavRimO5vWOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyv4ph6zgNP; Tue, 23 Jan 2024 17:45: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 40NHjx5C075958; Tue, 23 Jan 2024 17:45:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHjx87075955; Tue, 23 Jan 2024 17:45:59 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:45:59 GMT Message-Id: <202401231745.40NHjx87075955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: faeb273e7a8e - main - arm nexus: Use bus_generic_rman_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faeb273e7a8ec57d87de8d4337598fb11ae305c3 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=faeb273e7a8ec57d87de8d4337598fb11ae305c3 commit faeb273e7a8ec57d87de8d4337598fb11ae305c3 Author: John Baldwin AuthorDate: 2024-01-23 17:37:13 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:37:13 +0000 arm nexus: Use bus_generic_rman_* - Implement bus_get_rman pulling bits from nexus_alloc_resource. - Implement bus_map/unmap_resource pulling bits from nexus_activate/deactivate_resource. - Use bus_generic_rman_* for bus_alloc/adjust/activate/deactivate/release_resource except for custom interrupt activate/deactivate logic still in nexus_activate/deactivate_resource. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43437 --- sys/arm/arm/nexus.c | 220 +++++++++++++++++++++++----------------------------- 1 file changed, 97 insertions(+), 123 deletions(-) diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index 196e879fb0db..eb0d1a5b7ded 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -83,10 +83,10 @@ static bus_add_child_t nexus_add_child; static bus_print_child_t nexus_print_child; static bus_activate_resource_t nexus_activate_resource; -static bus_adjust_resource_t nexus_adjust_resource; -static bus_alloc_resource_t nexus_alloc_resource; static bus_deactivate_resource_t nexus_deactivate_resource; -static bus_release_resource_t nexus_release_resource; +static bus_get_rman_t nexus_get_rman; +static bus_map_resource_t nexus_map_resource; +static bus_unmap_resource_t nexus_unmap_resource; #ifdef SMP static bus_bind_intr_t nexus_bind_intr; @@ -119,10 +119,13 @@ static device_method_t nexus_methods[] = { DEVMETHOD(bus_add_child, nexus_add_child), DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_activate_resource, nexus_activate_resource), - DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), - DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_rman_adjust_resource), + DEVMETHOD(bus_alloc_resource, bus_generic_rman_alloc_resource), DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), - DEVMETHOD(bus_release_resource, nexus_release_resource), + DEVMETHOD(bus_get_rman, nexus_get_rman), + DEVMETHOD(bus_map_resource, nexus_map_resource), + DEVMETHOD(bus_release_resource, bus_generic_rman_release_resource), + DEVMETHOD(bus_unmap_resource, nexus_unmap_resource), #ifdef SMP DEVMETHOD(bus_bind_intr, nexus_bind_intr), #endif @@ -216,83 +219,18 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit) return (child); } -/* - * Allocate a resource on behalf of child. NB: child is usually going to be a - * child of one of our descendants, not a direct child of nexus0. - */ -static struct resource * -nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, - rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) +static struct rman * +nexus_get_rman(device_t bus, int type, u_int flags) { - struct resource *rv; - struct rman *rm; - int needactivate = flags & RF_ACTIVE; - - flags &= ~RF_ACTIVE; - switch (type) { case SYS_RES_IRQ: - rm = &irq_rman; - break; - + return (&irq_rman); case SYS_RES_MEMORY: case SYS_RES_IOPORT: - rm = &mem_rman; - break; - + return (&mem_rman); default: return (NULL); } - - rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == NULL) - return (NULL); - - rman_set_rid(rv, *rid); - - if (needactivate) { - if (bus_activate_resource(child, type, *rid, rv)) { - rman_release_resource(rv); - return (NULL); - } - } - - return (rv); -} - -static int -nexus_adjust_resource(device_t bus __unused, device_t child __unused, int type, - struct resource *r, rman_res_t start, rman_res_t end) -{ - struct rman *rm; - - switch (type) { - case SYS_RES_IRQ: - rm = &irq_rman; - break; - case SYS_RES_MEMORY: - rm = &mem_rman; - break; - default: - return (EINVAL); - } - if (rman_is_region_manager(r, rm) == 0) - return (EINVAL); - return (rman_adjust_resource(r, start, end)); -} - -static int -nexus_release_resource(device_t bus, device_t child, int type, int rid, - struct resource *res) -{ - int error; - - if (rman_get_flags(res) & RF_ACTIVE) { - error = bus_deactivate_resource(child, type, rid, res); - if (error) - return (error); - } - return (rman_release_resource(res)); } static bus_space_tag_t @@ -371,73 +309,109 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { int err; - bus_addr_t paddr; - bus_size_t psize; - bus_space_handle_t vaddr; - - if ((err = rman_activate_resource(r)) != 0) - return (err); - /* - * If this is a memory resource, map it into the kernel. - */ - if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - paddr = (bus_addr_t)rman_get_start(r); - psize = (bus_size_t)rman_get_size(r); -#ifdef FDT - err = bus_space_map(fdtbus_bs_tag, paddr, psize, 0, &vaddr); - if (err != 0) { - rman_deactivate_resource(r); + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_activate_resource(bus, child, type, + rid, r)); + case SYS_RES_IRQ: + err = rman_activate_resource(r); + if (err != 0) return (err); - } - rman_set_bustag(r, fdtbus_bs_tag); -#else - vaddr = (bus_space_handle_t)pmap_mapdev((vm_paddr_t)paddr, - (vm_size_t)psize); - if (vaddr == 0) { - rman_deactivate_resource(r); - return (ENOMEM); - } - rman_set_bustag(r, (void *)1); -#endif - rman_set_virtual(r, (void *)vaddr); - rman_set_bushandle(r, vaddr); - return (0); - } else if (type == SYS_RES_IRQ) { err = intr_activate_irq(child, r); if (err != 0) { rman_deactivate_resource(r); return (err); } + return (0); + default: + return (EINVAL); } - return (0); } static int -nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) +nexus_map_resource(device_t bus, device_t child, int type, struct resource *r, + struct resource_map_request *argsp, struct resource_map *map) { - bus_size_t psize; - bus_space_handle_t vaddr; + struct resource_map_request args; + rman_res_t length, start; + int error; + + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); + + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + break; + default: + return (EINVAL); + } - if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - psize = (bus_size_t)rman_get_size(r); - vaddr = rman_get_bushandle(r); + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); - if (vaddr != 0) { #ifdef FDT - bus_space_unmap(fdtbus_bs_tag, vaddr, psize); + error = bus_space_map(fdtbus_bs_tag, start, length, 0, + &map->r_bushandle); + if (error) + return (error); + map->r_bustag = fdtbus_bs_tag; + map->r_vaddr = (void *)map->r_bushandle; #else - pmap_unmapdev((void *)vaddr, (vm_size_t)psize); + map->r_vaddr = pmap_mapdev(start, length); + if (map->r_vaddr == NULL) + return (ENOMEM); + map->r_bustag = (void *)1; + map->r_bushandle = (bus_space_handle_t)map->r_vaddr; #endif - rman_set_virtual(r, NULL); - rman_set_bushandle(r, 0); - } - } else if (type == SYS_RES_IRQ) { - intr_deactivate_irq(child, r); + map->r_size = length; + return (0); +} + +static int +nexus_unmap_resource(device_t bus, device_t child, int type, struct resource *r, + struct resource_map *map) +{ + + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: +#ifdef FDT + bus_space_unmap(map->r_bustag, map->r_bushandle, map->r_size); +#else + pmap_unmapdev(map->r_vaddr, map->r_size); +#endif + return (0); + default: + return (EINVAL); } +} + +static int +nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + int error; - return (rman_deactivate_resource(r)); + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_deactivate_resource(bus, child, type, + rid, r)); + case SYS_RES_IRQ: + error = rman_deactivate_resource(r); + if (error) + return (error); + intr_deactivate_irq(child, r); + return (0); + default: + return (EINVAL); + } } #ifdef FDT From nobody Tue Jan 23 17:46:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyx3pjWz57mYc; Tue, 23 Jan 2024 17:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKDyw6YrRz47PS; Tue, 23 Jan 2024 17:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PYg1RPYB3X31tttfHjLZwfcEBPjzz0NNf4S2nN+CQ4g=; b=ywygEqMUf6c7UdxPcdowN6Ud+tjC120aBgLA/ZItUF5zyi5jKaxo6qGvhHcuLwLa/oJzTP Z6Cz4KCOD5luETlaF4B19lewUD73gJCwX/21YeGO5RBxY2cccD4vxgkkRnrtaPvIzXGKjx KST0tUOlYvOxZHN50Uz/fIGSVic/Gf5od/uL70WDuT2x4KW19PgFmUS8jpBFXJxHD+HiHl MEMMXoi1imL3sVR8H/56ub67Fo/mr//fNLrPte00cxXwtaYAmu4vqdK8XhIhMu0ty7JBlA IjNe3Ebra6hG8EgRvfMbbPKBVt4TqoBVes7AuHuUgmpZuOs2wFyBGwFp3deirQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PYg1RPYB3X31tttfHjLZwfcEBPjzz0NNf4S2nN+CQ4g=; b=SOm0SDgYTosX6GJFonABYLU/RwmvF6+LNDg9yPPk7TZzDZYXbpuqDcKH9XbH17Esv1pFtY tauPAv+Lt941ez/mYQjhUQexx/ArJR5yCF7LPRZus6P3KFbz7gc+OtOkRYi81SW3Cxi5Po Ub4+a0S7hS7AJoU+KRyJpfSr4WpIO5RBBacOm42mpnZSLOnk5PxzbHMuboVM8UZ7p49i4K C93hLPSRvXd2sjkQQNXEcEWtenhtFYfqJYEl+nvdQEhzKzwIZXgC3gXJRjBD0/tRlpvmbm jQEvmMK8bCHbfFkCUntj3HpPP2oDJJJohGHgZdxD0SKbBQx2H8ynWJacbqtIpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031960; a=rsa-sha256; cv=none; b=RwApt6QQ3O186FQMRr7jQb3Azan3znXQ5jqqZhHIEWqjtlDuwAWiFMj+9eTGiUnSpxaJ7m ++mMmzgN6+UD5598n6fJEdRe2NCP/vBIMmWspM5eWeaMfS2UYr/TTHpldPehZaw4HhpLyM AihlKAnCJC4LDGVrTGTRqsq1n2lbDK0HS70W0cApoiRkbSKgG2UPseHxct8uraviU47yU1 s98Hcg5IipYJr5+YltEx/NSjdFpYIOTpAmUqMoAE07IcAl9cRxg81q6a6GU6/xd84LkyKe R7y7lR3fRCG++Tti2+uQJc4mCdaKeS1KSDZIFwHFcTpM1SFu8AIvPdgSRfMW6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyw5gc6zgNQ; Tue, 23 Jan 2024 17:46: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 40NHk0Ho076010; Tue, 23 Jan 2024 17:46:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHk0iW076007; Tue, 23 Jan 2024 17:46:00 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:46:00 GMT Message-Id: <202401231746.40NHk0iW076007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4e1d94d99798 - main - arm mv_pcib: Use bus_generic_rman_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e1d94d99798b9176b477062a9c7502c33d3e810 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4e1d94d99798b9176b477062a9c7502c33d3e810 commit 4e1d94d99798b9176b477062a9c7502c33d3e810 Author: John Baldwin AuthorDate: 2024-01-23 17:37:30 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:37:30 +0000 arm mv_pcib: Use bus_generic_rman_* - Implement bus_get_rman pulling bits from mv_pcib_alloc_resource. - Implement bus_map/unmap_resource pulling bits from mv_pcib_activate/deactivate_resource. - Use bus_generic_rman_* to handle memory and I/O resources for mv_pcib_alloc/activate/adjust/deactivate/release_resource. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43438 --- sys/arm/mv/mv_pci.c | 180 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 157 insertions(+), 23 deletions(-) diff --git a/sys/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c index 74fc0419bf22..76da1c4da7a7 100644 --- a/sys/arm/mv/mv_pci.c +++ b/sys/arm/mv/mv_pci.c @@ -342,10 +342,21 @@ static int mv_pcib_mem_init(struct mv_pcib_softc *); static int mv_pcib_probe(device_t); static int mv_pcib_attach(device_t); +static struct rman *mv_pcib_get_rman(device_t, int, u_int); static struct resource *mv_pcib_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); +static int mv_pcib_adjust_resource(device_t, device_t, int, struct resource *, + rman_res_t, rman_res_t); static int mv_pcib_release_resource(device_t, device_t, int, int, struct resource *); +static int mv_pcib_activate_resource(device_t, device_t, int, int, + struct resource *r); +static int mv_pcib_deactivate_resource(device_t, device_t, int, int, + struct resource *r); +static int mv_pcib_map_resource(device_t, device_t, int, struct resource *, + struct resource_map_request *, struct resource_map *); +static int mv_pcib_unmap_resource(device_t, device_t, int, struct resource *, + struct resource_map *); static int mv_pcib_read_ivar(device_t, device_t, int, uintptr_t *); static int mv_pcib_write_ivar(device_t, device_t, int, uintptr_t); @@ -370,10 +381,14 @@ static device_method_t mv_pcib_methods[] = { /* Bus interface */ DEVMETHOD(bus_read_ivar, mv_pcib_read_ivar), DEVMETHOD(bus_write_ivar, mv_pcib_write_ivar), + DEVMETHOD(bus_get_rman, mv_pcib_get_rman), DEVMETHOD(bus_alloc_resource, mv_pcib_alloc_resource), + DEVMETHOD(bus_adjust_resource, mv_pcib_adjust_resource), DEVMETHOD(bus_release_resource, mv_pcib_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_activate_resource, mv_pcib_activate_resource), + DEVMETHOD(bus_deactivate_resource, mv_pcib_deactivate_resource), + DEVMETHOD(bus_map_resource, mv_pcib_map_resource), + DEVMETHOD(bus_unmap_resource, mv_pcib_unmap_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -876,20 +891,30 @@ mv_pcib_init_all_bars(struct mv_pcib_softc *sc, int bus, int slot, return (0); } +static struct rman * +mv_pcib_get_rman(device_t dev, int type, u_int flags) +{ + struct mv_pcib_softc *sc = device_get_softc(dev); + + switch (type) { + case SYS_RES_IOPORT: + return (&sc->sc_io_rman); + case SYS_RES_MEMORY: + return (&sc->sc_mem_rman); + default: + return (NULL); + } +} + static struct resource * mv_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { struct mv_pcib_softc *sc = device_get_softc(dev); - struct rman *rm = NULL; - struct resource *res; switch (type) { case SYS_RES_IOPORT: - rm = &sc->sc_io_rman; - break; case SYS_RES_MEMORY: - rm = &sc->sc_mem_rman; break; #ifdef PCI_RES_BUS case PCI_RES_BUS: @@ -911,21 +936,32 @@ mv_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, (end > sc->sc_mem_base + sc->sc_mem_size - 1)) return (NULL); - res = rman_reserve_resource(rm, start, end, count, flags, child); - if (res == NULL) - return (NULL); - - rman_set_rid(res, *rid); - rman_set_bustag(res, fdtbus_bs_tag); - rman_set_bushandle(res, start); + return (bus_generic_rman_alloc_resource(dev, child, type, rid, + start, end, count, flags)); +} - if (flags & RF_ACTIVE) - if (bus_activate_resource(child, type, *rid, res)) { - rman_release_resource(res); - return (NULL); - } +static int +mv_pcib_adjust_resource(device_t dev, device_t child, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ +#ifdef PCI_RES_BUS + struct mv_pcib_softc *sc = device_get_softc(dev); +#endif - return (res); + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_adjust_resource(dev, child, type, r, + start, end)); +#ifdef PCI_RES_BUS + case PCI_RES_BUS: + return (pci_domain_adjust_bus(sc->ap_segment, child, r, start, + end)); +#endif + default: + return (bus_generic_adjust_resource(dev, child, type, r, + start, end)); + } } static int @@ -934,15 +970,113 @@ mv_pcib_release_resource(device_t dev, device_t child, int type, int rid, { #ifdef PCI_RES_BUS struct mv_pcib_softc *sc = device_get_softc(dev); +#endif - if (type == PCI_RES_BUS) + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_release_resource(dev, child, type, + rid, res)); +#ifdef PCI_RES_BUS + case PCI_RES_BUS: return (pci_domain_release_bus(sc->ap_segment, child, rid, res)); #endif - if (type != SYS_RES_IOPORT && type != SYS_RES_MEMORY) + default: return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child, type, rid, res)); + } +} + +static int +mv_pcib_activate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ +#ifdef PCI_RES_BUS + struct mv_pcib_softc *sc = device_get_softc(dev); +#endif + + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_activate_resource(dev, child, type, + rid, r)); +#ifdef PCI_RES_BUS + case PCI_RES_BUS: + return (pci_domain_activate_bus(sc->ap_segment, child, rid, r)); +#endif + default: + return (bus_generic_activate_resource(dev, child, type, rid, + r)); + } +} + +static int +mv_pcib_deactivate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ +#ifdef PCI_RES_BUS + struct mv_pcib_softc *sc = device_get_softc(dev); +#endif + + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_deactivate_resource(dev, child, type, + rid, r)); +#ifdef PCI_RES_BUS + case PCI_RES_BUS: + return (pci_domain_deactivate_bus(sc->ap_segment, child, rid, + r)); +#endif + default: + return (bus_generic_deactivate_resource(dev, child, type, rid, + r)); + } +} + +static int +mv_pcib_map_resource(device_t dev, device_t child, int type, struct resource *r, + struct resource_map_request *argsp, struct resource_map *map) +{ + struct resource_map_request args; + rman_res_t length, start; + int error; - return (rman_release_resource(res)); + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); + + /* Mappings are only supported on I/O and memory resources. */ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + break; + default: + return (EINVAL); + } + + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); + + map->r_bustag = fdtbus_bs_tag; + map->r_bushandle = start; + map->r_size = length; + return (0); +} + +static int +mv_pcib_unmap_resource(device_t dev, device_t child, int type, + struct resource *r, struct resource_map *map) +{ + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (0); + default: + return (EINVAL); + } } static int From nobody Tue Jan 23 17:46:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyy34C7z57mG8; Tue, 23 Jan 2024 17:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKDyy0XJkz47Pg; Tue, 23 Jan 2024 17:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFfDwozf31XXIlruj2sKrzpCdsLPgPZrtbPQdpKPkcE=; b=jOFisCs0RZk9RY7bGPGVJS01yH+ST9tig6V2BYOUTtKp93l5bS3RJEfTiOGMUhGV/Txx+C w3abf/MLQTLnYzCuvwYuiGvrUynl+0aG4fnNnQU5DT0ozJogk/Ysj6X3i6a85uamkIySs+ Sr/L1Rg7Ow1E1BiL7bfRIoX6ZHpCe72uYPaexJuP5Eru48IM7kN18MPfYA9Z3X52vMcpnW 4fi+DVHjh6m0Dt5VxCRgFFsQ4poa3UeWl1pL9TNUUDWYsJj0W0r2eQjDcr73Ll8xlE6SeD NHUgOuwfO3CjkttjLLfplL/qqb5LjNG4sZgpdVL8nQts7h8MOiW3Izdf05srCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFfDwozf31XXIlruj2sKrzpCdsLPgPZrtbPQdpKPkcE=; b=G5XXM20l1HGQ+cVUrj/WXWIIO0o9y+ciybluDwYf/8KRbuYWa+QBcHLxF1pp4B8EpAztrA sk7r4MwmOwPMATfJI9vSagook4BOTmmTPjmDYaHIwLWrwvd9T1DPux58xXvExc+GQhbMrV 5oAv0Fdyb0eKbIEND1EWAMG5Tmm5q8NgoXH2abTlAw9hwJC4cNmT1ddafnmp106RmC3UEg /1VsAVpu/IJ+kCtBBiQR321lCOR5i7I+K9EAWKmSxXaYt7UOzh1LaSOk9lllBT3y/DiffQ HWW/yg1e0By0lXv/8fSP+UDqaG4Y5EbXlOpHyelX82x+IP0eniaazPswa12THg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031962; a=rsa-sha256; cv=none; b=ZxV3oG51esRI1Lon++p1jD3q6I/stEM0A3XIlLnSGBvwjI+H2jEskGLz/TyZkIy7sbud4W 3C3TLqNJAXR8Ru8QCmtxdeIz5CwgJ40oKjGIPJ34E5j2ct9HFulVi0uVCTDtF17d6qrDjm V71x0+oSIe54y6/MAxj3srJMbQV2pKQQBQMdhF5EcRDaGlh8iwymoOBM3FbvqqyJWqeoqp b5JroQ5/7/GdomyrkNohTQnOu13uxGwhKndvp6l26Wblotf12eFs0CtdvswRSTSz2k0oy9 EDtSFDdebeoHAf2wz1FrSVrA5MekxCpAD7E2u9noqHO/ATs2E3OMj6YZ5u8fbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyx6hPfzg8y; Tue, 23 Jan 2024 17:46: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 40NHk1Iu076061; Tue, 23 Jan 2024 17:46:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHk1DO076058; Tue, 23 Jan 2024 17:46:01 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:46:01 GMT Message-Id: <202401231746.40NHk1DO076058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e5c6dbd57614 - main - arm64 thunder: Use bus_generic_rman_* in the pcie_pem driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5c6dbd576140c423b73ef6c908ffef6178cff9b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e5c6dbd576140c423b73ef6c908ffef6178cff9b commit e5c6dbd576140c423b73ef6c908ffef6178cff9b Author: John Baldwin AuthorDate: 2024-01-23 17:37:41 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:37:41 +0000 arm64 thunder: Use bus_generic_rman_* in the pcie_pem driver - Implement bus_map/unmap_resource pulling bits from the previous thunder_pem_activate/deactivate_resource. - Use bus_generic_rman_* in various routines for memory and I/O port resources. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43439 --- sys/arm64/cavium/thunder_pcie_pem.c | 206 ++++++++++++++++++++++-------------- 1 file changed, 124 insertions(+), 82 deletions(-) diff --git a/sys/arm64/cavium/thunder_pcie_pem.c b/sys/arm64/cavium/thunder_pcie_pem.c index a1bd54d9744d..5060b6e79d97 100644 --- a/sys/arm64/cavium/thunder_pcie_pem.c +++ b/sys/arm64/cavium/thunder_pcie_pem.c @@ -136,6 +136,10 @@ static int thunder_pem_get_id(device_t, device_t, enum pci_id_type, static int thunder_pem_attach(device_t); static int thunder_pem_deactivate_resource(device_t, device_t, int, int, struct resource *); +static int thunder_pem_map_resource(device_t, device_t, int, struct resource *, + struct resource_map_request *, struct resource_map *); +static int thunder_pem_unmap_resource(device_t, device_t, int, + struct resource *, struct resource_map *); static bus_dma_tag_t thunder_pem_get_dma_tag(device_t, device_t); static int thunder_pem_detach(device_t); static uint64_t thunder_pem_config_reg_read(struct thunder_pem_softc *, int); @@ -148,7 +152,7 @@ static int thunder_pem_read_ivar(device_t, device_t, int, uintptr_t *); static void thunder_pem_release_all(device_t); static int thunder_pem_release_resource(device_t, device_t, int, int, struct resource *); -static struct rman * thunder_pem_rman(struct thunder_pem_softc *, int); +static struct rman * thunder_pem_get_rman(device_t, int, u_int); static void thunder_pem_slix_s2m_regx_acc_modify(struct thunder_pem_softc *, int, int); static void thunder_pem_write_config(device_t, u_int, u_int, u_int, u_int, @@ -168,11 +172,14 @@ static device_method_t thunder_pem_methods[] = { /* Bus interface */ DEVMETHOD(bus_read_ivar, thunder_pem_read_ivar), DEVMETHOD(bus_write_ivar, thunder_pem_write_ivar), + DEVMETHOD(bus_get_rman, thunder_pem_get_rman), DEVMETHOD(bus_alloc_resource, thunder_pem_alloc_resource), DEVMETHOD(bus_release_resource, thunder_pem_release_resource), DEVMETHOD(bus_adjust_resource, thunder_pem_adjust_resource), DEVMETHOD(bus_activate_resource, thunder_pem_activate_resource), DEVMETHOD(bus_deactivate_resource, thunder_pem_deactivate_resource), + DEVMETHOD(bus_map_resource, thunder_pem_map_resource), + DEVMETHOD(bus_unmap_resource, thunder_pem_unmap_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -250,86 +257,125 @@ static int thunder_pem_activate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { - int err; - bus_addr_t paddr; - bus_size_t psize; - bus_space_handle_t vaddr; +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct thunder_pem_softc *sc; - if ((err = rman_activate_resource(r)) != 0) - return (err); + sc = device_get_softc(dev); +#endif + switch (type) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + case PCI_RES_BUS: + return (pci_domain_activate_bus(sc->id, child, rid, r)); +#endif + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_activate_resource(dev, child, type, + rid, r)); + default: + return (bus_generic_activate_resource(dev, child, type, rid, + r)); + } +} + +static int +thunder_pem_deactivate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + struct thunder_pem_softc *sc; sc = device_get_softc(dev); +#endif + switch (type) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + case PCI_RES_BUS: + return (pci_domain_deactivate_bus(sc->id, child, rid, r)); +#endif + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_deactivate_resource(dev, child, type, + rid, r)); + default: + return (bus_generic_deactivate_resource(dev, child, type, rid, + r)); + } +} - /* - * If this is a memory resource, map it into the kernel. - */ - if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - paddr = (bus_addr_t)rman_get_start(r); - psize = (bus_size_t)rman_get_size(r); +static int +thunder_pem_map_resource(device_t dev, device_t child, int type, + struct resource *r, struct resource_map_request *argsp, + struct resource_map *map) +{ + struct resource_map_request args; + struct thunder_pem_softc *sc; + rman_res_t length, start; + int error; - paddr = range_addr_pci_to_phys(sc->ranges, paddr); + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); - err = bus_space_map(&memmap_bus, paddr, psize, 0, &vaddr); - if (err != 0) { - rman_deactivate_resource(r); - return (err); - } - rman_set_bustag(r, &memmap_bus); - rman_set_virtual(r, (void *)vaddr); - rman_set_bushandle(r, vaddr); + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + break; + default: + return (EINVAL); } + + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); + + sc = device_get_softc(dev); + start = range_addr_pci_to_phys(sc->ranges, start); + error = bus_space_map(&memmap_bus, start, length, 0, &map->r_bushandle); + if (error) + return (error); + map->r_bustag = &memmap_bus; + map->r_vaddr = (void *)map->r_bushandle; + map->r_size = length; return (0); } -/* - * This function is an exact copy of nexus_deactivate_resource() - * Keep it up-to-date with all changes in nexus. To be removed - * once bus-mapping interface is developed. - */ static int -thunder_pem_deactivate_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) +thunder_pem_unmap_resource(device_t dev, device_t child, int type, + struct resource *r, struct resource_map *map) { - bus_size_t psize; - bus_space_handle_t vaddr; - psize = (bus_size_t)rman_get_size(r); - vaddr = rman_get_bushandle(r); - - if (vaddr != 0) { - bus_space_unmap(&memmap_bus, vaddr, psize); - rman_set_virtual(r, NULL); - rman_set_bushandle(r, 0); + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + bus_space_unmap(map->r_bustag, map->r_bushandle, map->r_size); + return (0); + default: + return (EINVAL); } - - return (rman_deactivate_resource(r)); } static int thunder_pem_adjust_resource(device_t dev, device_t child, int type, struct resource *res, rman_res_t start, rman_res_t end) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct thunder_pem_softc *sc; - struct rman *rm; sc = device_get_softc(dev); +#endif + switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) - if (type == PCI_RES_BUS) + case PCI_RES_BUS: return (pci_domain_adjust_bus(sc->id, child, res, start, end)); #endif - - rm = thunder_pem_rman(sc, type); - if (rm == NULL) + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_adjust_resource(dev, child, type, res, + start, end)); + default: return (bus_generic_adjust_resource(dev, child, type, res, start, end)); - if (!rman_is_region_manager(res, rm)) - /* - * This means a child device has a memory or I/O - * resource not from you which shouldn't happen. - */ - return (EINVAL); - return (rman_adjust_resource(res, start, end)); + } } static bus_dma_tag_t @@ -629,17 +675,19 @@ thunder_pem_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { struct thunder_pem_softc *sc = device_get_softc(dev); - struct rman *rm = NULL; struct resource *res; device_t parent_dev; + switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) - if (type == PCI_RES_BUS) + case PCI_RES_BUS: return (pci_domain_alloc_bus(sc->id, child, rid, start, end, count, flags)); #endif - rm = thunder_pem_rman(sc, type); - if (rm == NULL) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + break; + default: /* Find parent device. On ThunderX we know an exact path. */ parent_dev = device_get_parent(device_get_parent(dev)); return (BUS_ALLOC_RESOURCE(parent_dev, dev, type, rid, start, @@ -663,28 +711,15 @@ thunder_pem_alloc_resource(device_t dev, device_t child, int type, int *rid, start, end, count); } - res = rman_reserve_resource(rm, start, end, count, flags, child); - if (res == NULL) - goto fail; - - rman_set_rid(res, *rid); - - if (flags & RF_ACTIVE) - if (bus_activate_resource(child, type, *rid, res)) { - rman_release_resource(res); - goto fail; - } - - return (res); - -fail: - if (bootverbose) { + res = bus_generic_rman_alloc_resource(dev, child, type, rid, start, + end, count, flags); + if (res == NULL && bootverbose) { device_printf(dev, "%s FAIL: type=%d, rid=%d, " "start=%016lx, end=%016lx, count=%016lx, flags=%x\n", __func__, type, *rid, start, end, count, flags); } - return (NULL); + return (res); } static int @@ -694,24 +729,31 @@ thunder_pem_release_resource(device_t dev, device_t child, int type, int rid, device_t parent_dev; #if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct thunder_pem_softc *sc = device_get_softc(dev); +#endif - if (type == PCI_RES_BUS) + switch (type) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + case PCI_RES_BUS: return (pci_domain_release_bus(sc->id, child, rid, res)); #endif - /* Find parent device. On ThunderX we know an exact path. */ - parent_dev = device_get_parent(device_get_parent(dev)); - - if ((type != SYS_RES_MEMORY) && (type != SYS_RES_IOPORT)) + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_release_resource(dev, child, type, + rid, res)); + default: + /* Find parent device. On ThunderX we know an exact path. */ + parent_dev = device_get_parent(device_get_parent(dev)); return (BUS_RELEASE_RESOURCE(parent_dev, child, type, rid, res)); - - return (rman_release_resource(res)); + } } static struct rman * -thunder_pem_rman(struct thunder_pem_softc *sc, int type) +thunder_pem_get_rman(device_t bus, int type, u_int flags) { + struct thunder_pem_softc *sc; + sc = device_get_softc(bus); switch (type) { case SYS_RES_IOPORT: return (&sc->io_rman); @@ -866,7 +908,7 @@ thunder_pem_attach(device_t dev) if (size == 0) continue; /* empty range element */ - rman = thunder_pem_rman(sc, sc->ranges[tuple].flags); + rman = thunder_pem_get_rman(dev, sc->ranges[tuple].flags, 0); if (rman != NULL) error = rman_manage_region(rman, base, base + size - 1); From nobody Tue Jan 23 17:46:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDz03zsxz57mYx; Tue, 23 Jan 2024 17:46: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 4TKDz02VkQz47FL; Tue, 23 Jan 2024 17:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H/1J2n4Lj7bLYgijacash8EKRytzTXfHwU26EPpVqqg=; b=nkYeipN6sMJEkrICZh23sseBhzfmmGUVGCRjFOUVvQWD190YLXdr4AqSDkYqzH99BAckH1 EReI7ZCC/MVBkWpaDl94ZdlO9zkHu+U2azopr6/rk3b/0q8rXSW2iALp8p8zR85sc/F0Fu R29RKFQ8Y9Ult37OuqqcD8T+kkjcQUmgas+/iSIocYnJDgWaOs6sU4ghUGs+RWRcbae6aq xZh4bLTN/mIXX/1/AvgTofIMWKerW+jPlhERADdaDU1uSVCcsYPD9vZqcch2RfPAA8UdNb lW71CDFi7nXg+L6uBX1nwwN0rfN/qH6rq6rEox6yuSeWi/wdK3PteC4ndoGg7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H/1J2n4Lj7bLYgijacash8EKRytzTXfHwU26EPpVqqg=; b=e+QQFOYY+8L43F3iRBKfx9VwpqijyBtEOg10eCrc+U+glf6AJAU82coJBC4lvVVhfZXlv8 zc4zfa71lWIvnEt9z2HIGHLK9Gm2qRpVJIybPbCKEZp21K2VZLhAeQlHu30V4YaH7e6IRS NqFXM0WnI23Zm7neYzsZyJOo76DvLYry5f0TFtlYopxRYlF4kVwdhvV53HQzWljDrymdDC W/W0clzwt+UWeIuTDKmGszuECRkKYh6jhke/6PVlzNh2VnrwP4IAG4r0YLZlLvQauH5qdH ngnpV7qUGo9fiN2Fvq/OWXabMd1dVIudFrUJu0/qs+xJH9Hs6M5SGmq+bPFrIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031964; a=rsa-sha256; cv=none; b=tOGeW0ryFGwJrMqJ+6NPSCcyXMpjXe2s2keQDNkPmlNusDXHI8GQOL0P+bhSY5uPZswVIB IyFaJpa9f3M/RzUwSNoyG3gL/bhcBAdOaIJ3Gl5RBEmULujA5jKjY+lmx61PXZtJr8z+kc sYT31Bsbn7wNaSHM9zpEKH5u2wPS9e/Ut6Q6sdy9sckMjg5q7wriQicdpTN8YrAQKmYPwf aEskvLxgJ0satLeJicYYBqEgZmTEjcUUQ4G+CeJXmBVeCQK6G2sfFWFU2rYyx6Pt/zbgau JDmY6Y62H4NJBu4y8OTE8kWxqmFsNTAoGce7s5Y+8yvzX3WB9ii1BI1WcQxzJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDz01Y4dzfyC; Tue, 23 Jan 2024 17:46: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 40NHk42e076133; Tue, 23 Jan 2024 17:46:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHk4Sp076130; Tue, 23 Jan 2024 17:46:04 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:46:04 GMT Message-Id: <202401231746.40NHk4Sp076130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0b60d7a60099 - main - ofw_pcib: Use bus_generic_rman_* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b60d7a60099e6ce81e0fb012946a1e77b0626c4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0b60d7a60099e6ce81e0fb012946a1e77b0626c4 commit 0b60d7a60099e6ce81e0fb012946a1e77b0626c4 Author: John Baldwin AuthorDate: 2024-01-23 17:38:09 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:38:09 +0000 ofw_pcib: Use bus_generic_rman_* - Implement bus_map/unmap_resource pulling bits from the previous ofw_pcib_activate/deactivate_resource. One difference here is that the bus_unmap_resource implementation uses bus_space_unmap instead of pmap_unmapdev as a complement to the existing use of bus_space_map. - Use bus_generic_rman_* in various routines for memory and I/O port resources. - Use pci_domain_* for PCI_RES_BUS in ofw_pcib_activate/deactivate_resource. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43441 --- sys/dev/ofw/ofw_pcib.c | 215 ++++++++++++++++++++++++++++--------------------- 1 file changed, 123 insertions(+), 92 deletions(-) diff --git a/sys/dev/ofw/ofw_pcib.c b/sys/dev/ofw/ofw_pcib.c index 2bcaa05ab1ed..f8d0fc8e7029 100644 --- a/sys/dev/ofw/ofw_pcib.c +++ b/sys/dev/ofw/ofw_pcib.c @@ -64,6 +64,7 @@ /* * bus interface. */ +static struct rman *ofw_pcib_get_rman(device_t, int, u_int); static struct resource * ofw_pcib_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); static int ofw_pcib_release_resource(device_t, device_t, int, int, @@ -74,6 +75,10 @@ static int ofw_pcib_deactivate_resource(device_t, device_t, int, int, struct resource *); static int ofw_pcib_adjust_resource(device_t, device_t, int, struct resource *, rman_res_t, rman_res_t); +static int ofw_pcib_map_resource(device_t, device_t, int, struct resource *, + struct resource_map_request *, struct resource_map *); +static int ofw_pcib_unmap_resource(device_t, device_t, int, struct resource *, + struct resource_map *); static int ofw_pcib_translate_resource(device_t bus, int type, rman_res_t start, rman_res_t *newstart); @@ -95,7 +100,6 @@ static phandle_t ofw_pcib_get_node(device_t, device_t); * local methods */ static int ofw_pcib_fill_ranges(phandle_t, struct ofw_pci_range *); -static struct rman *ofw_pcib_get_rman(struct ofw_pci_softc *, int, u_int); /* * Driver methods. @@ -110,11 +114,14 @@ static device_method_t ofw_pcib_methods[] = { DEVMETHOD(bus_write_ivar, ofw_pcib_write_ivar), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_get_rman, ofw_pcib_get_rman), DEVMETHOD(bus_alloc_resource, ofw_pcib_alloc_resource), DEVMETHOD(bus_release_resource, ofw_pcib_release_resource), DEVMETHOD(bus_activate_resource, ofw_pcib_activate_resource), DEVMETHOD(bus_deactivate_resource, ofw_pcib_deactivate_resource), DEVMETHOD(bus_adjust_resource, ofw_pcib_adjust_resource), + DEVMETHOD(bus_map_resource, ofw_pcib_map_resource), + DEVMETHOD(bus_unmap_resource, ofw_pcib_unmap_resource), DEVMETHOD(bus_translate_resource, ofw_pcib_translate_resource), #ifdef __powerpc__ DEVMETHOD(bus_get_bus_tag, ofw_pcib_bus_get_bus_tag), @@ -417,80 +424,50 @@ static struct resource * ofw_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct ofw_pci_softc *sc; - struct resource *rv; - struct rman *rm; - int needactivate; - - needactivate = flags & RF_ACTIVE; - flags &= ~RF_ACTIVE; sc = device_get_softc(bus); - +#endif + switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) - if (type == PCI_RES_BUS) { - return (pci_domain_alloc_bus(sc->sc_pci_domain, child, rid, - start, end, count, flags | needactivate)); - } + case PCI_RES_BUS: + return (pci_domain_alloc_bus(sc->sc_pci_domain, child, rid, + start, end, count, flags)); #endif - - rm = ofw_pcib_get_rman(sc, type, flags); - if (rm == NULL) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_alloc_resource(bus, child, type, rid, + start, end, count, flags)); + default: return (bus_generic_alloc_resource(bus, child, type, rid, - start, end, count, flags | needactivate)); - } - - rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == NULL) { - device_printf(bus, "failed to reserve resource for %s\n", - device_get_nameunit(child)); - return (NULL); + start, end, count, flags)); } - - rman_set_rid(rv, *rid); - - if (needactivate) { - if (bus_activate_resource(child, type, *rid, rv) != 0) { - device_printf(bus, - "failed to activate resource for %s\n", - device_get_nameunit(child)); - rman_release_resource(rv); - return (NULL); - } - } - - return (rv); } static int ofw_pcib_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct ofw_pci_softc *sc; - struct rman *rm; - int error; sc = device_get_softc(bus); - +#endif + switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) - if (type == PCI_RES_BUS) + case PCI_RES_BUS: return (pci_domain_release_bus(sc->sc_pci_domain, child, rid, res)); #endif - - rm = ofw_pcib_get_rman(sc, type, rman_get_flags(res)); - if (rm == NULL) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_release_resource(bus, child, type, rid, + res)); + default: return (bus_generic_release_resource(bus, child, type, rid, res)); } - KASSERT(rman_is_region_manager(res, rm), ("rman mismatch")); - - if (rman_get_flags(res) & RF_ACTIVE) { - error = bus_deactivate_resource(child, type, rid, res); - if (error != 0) - return (error); - } - return (rman_release_resource(res)); } static int @@ -536,26 +513,59 @@ static int ofw_pcib_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct ofw_pci_softc *sc; - bus_space_handle_t handle; - bus_space_tag_t tag; - struct ofw_pci_range *rp; - vm_paddr_t start; - int space; - int rv; sc = device_get_softc(bus); - - if (type != SYS_RES_IOPORT && type != SYS_RES_MEMORY) { +#endif + switch (type) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + case PCI_RES_BUS: + return (pci_domain_activate_bus(sc->sc_pci_domain, child, rid, + res)); +#endif + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_activate_resource(bus, child, type, rid, + res)); + default: return (bus_generic_activate_resource(bus, child, type, rid, res)); } +} + +static int +ofw_pcib_map_resource(device_t dev, device_t child, int type, + struct resource *r, struct resource_map_request *argsp, + struct resource_map *map) +{ + struct resource_map_request args; + struct ofw_pci_softc *sc; + struct ofw_pci_range *rp; + rman_res_t length, start; + int error, space; + + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); + + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + break; + default: + return (EINVAL); + } - start = (vm_paddr_t)rman_get_start(res); + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); /* * Map this through the ranges list */ + sc = device_get_softc(dev); for (rp = sc->sc_range; rp < sc->sc_range + sc->sc_nrange && rp->pci_hi != 0; rp++) { if (start < rp->pci || start >= rp->pci + rp->size) @@ -571,7 +581,7 @@ ofw_pcib_activate_resource(device_t bus, device_t child, int type, int rid, break; default: space = -1; - } + } if (type == space) { start += (rp->host - rp->pci); @@ -580,23 +590,35 @@ ofw_pcib_activate_resource(device_t bus, device_t child, int type, int rid, } if (bootverbose) - printf("ofw_pci mapdev: start %jx, len %jd\n", - (rman_res_t)start, rman_get_size(res)); + printf("ofw_pci mapdev: start %jx, len %jd\n", start, length); - tag = BUS_GET_BUS_TAG(child, child); - if (tag == NULL) + map->r_bustag = BUS_GET_BUS_TAG(child, child); + if (map->r_bustag == NULL) return (ENOMEM); - rman_set_bustag(res, tag); - rv = bus_space_map(tag, start, - rman_get_size(res), 0, &handle); - if (rv != 0) - return (ENOMEM); + error = bus_space_map(map->r_bustag, start, length, 0, + &map->r_bushandle); + if (error != 0) + return (error); - rman_set_bushandle(res, handle); - rman_set_virtual(res, (void *)handle); /* XXX for powerpc only ? */ + /* XXX for powerpc only? */ + map->r_vaddr = (void *)map->r_bushandle; + map->r_size = length; + return (0); +} - return (rman_activate_resource(res)); +static int +ofw_pcib_unmap_resource(device_t dev, device_t child, int type, + struct resource *r, struct resource_map *map) +{ + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + bus_space_unmap(map->r_bustag, map->r_bushandle, map->r_size); + return (0); + default: + return (EINVAL); + } } #ifdef __powerpc__ @@ -612,43 +634,50 @@ static int ofw_pcib_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - vm_size_t psize; +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + struct ofw_pci_softc *sc; - if (type != SYS_RES_IOPORT && type != SYS_RES_MEMORY) { + sc = device_get_softc(bus); +#endif + switch (type) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + case PCI_RES_BUS: + return (pci_domain_deactivate_bus(sc->sc_pci_domain, child, rid, + res)); +#endif + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_deactivate_resource(bus, child, type, + rid, res)); + default: return (bus_generic_deactivate_resource(bus, child, type, rid, res)); } - - psize = rman_get_size(res); - pmap_unmapdev(rman_get_virtual(res), psize); - - return (rman_deactivate_resource(res)); } static int ofw_pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *res, rman_res_t start, rman_res_t end) { - struct rman *rm; +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct ofw_pci_softc *sc; sc = device_get_softc(bus); +#endif + switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) - if (type == PCI_RES_BUS) + case PCI_RES_BUS: return (pci_domain_adjust_bus(sc->sc_pci_domain, child, res, start, end)); #endif - - rm = ofw_pcib_get_rman(sc, type, rman_get_flags(res)); - if (rm == NULL) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + return (bus_generic_rman_adjust_resource(bus, child, type, res, + start, end)); + default: return (bus_generic_adjust_resource(bus, child, type, res, start, end)); } - KASSERT(rman_is_region_manager(res, rm), ("rman mismatch")); - KASSERT(!(rman_get_flags(res) & RF_ACTIVE), - ("active resources cannot be adjusted")); - - return (rman_adjust_resource(res, start, end)); } static phandle_t @@ -710,9 +739,11 @@ ofw_pcib_fill_ranges(phandle_t node, struct ofw_pci_range *ranges) } static struct rman * -ofw_pcib_get_rman(struct ofw_pci_softc *sc, int type, u_int flags) +ofw_pcib_get_rman(device_t bus, int type, u_int flags) { + struct ofw_pci_softc *sc; + sc = device_get_softc(bus); switch (type) { case SYS_RES_IOPORT: return (&sc->sc_io_rman); From nobody Tue Jan 23 17:46:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDyz2Xp0z57mrQ; Tue, 23 Jan 2024 17:46: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 4TKDyz1KgFz47H8; Tue, 23 Jan 2024 17:46:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=peuBwv+YX+HYmh4A9NqwRxygmrDZ6PMgiJTpaXN15lM=; b=ED1Cww1j1BWVDGPj8/9Lts/kXMbBU5Kk+Pw1KeIVbtloLb5VSq3YbGTrxhiMwYPp4tC1Gu WL19Gw90vwo89aPpUDytusoBEQBxVyPeDIPQNmwnjDGWq9EEvPIJVYzFwy46/UXek0HqWc EDcFgc6h23lYc7pwT7fq41IL/jrxvae1QU+UwnIyCcSVOnTMj5KYRSPjBjj5+zjKfc6x1+ 7ruSGiUETZQ+/MMBwyJov45ZVHM6gi3xNn7llM3eppBQZy+6t6bTLMvoUG5TUxAS7FbyTb +jexYtV2fl9JmGsDLjtoGqJJTZHG8pPsu0Ta4Oqm2sFmJgNCNZ7oU53f3asfRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=peuBwv+YX+HYmh4A9NqwRxygmrDZ6PMgiJTpaXN15lM=; b=xvCL+/Ndpo17RC3LhzYFPjn3a7pWy3sIvdu7GjEfwB6VWFf0FIS+QhvFlwr9BATrkA+dax 4XOZDRe9kXu1Q+T7xCnLFDGmNB0hi+kHL2rgzUL1vC9WY2wWURQAx258EAY9xrwsENFgcn vviWm/53RZbyKaBSZ+bjKKf4HFblfjHRVq+X+kL6lK+ipN4oQ0d1eGTq2lt8YhjzeXvb/P /gZa5zeEnQxwqYeYmkzzzUuoOkErdi9vCcGiVC+9kUZx0NYQHRA9y7TKBlOMqOCEX3y3ed TJrf37TLMPmR6uCV2rJlaiXz0GBAp/mE9CTlxvjSdS8bmiyul0w6iP7rTrBnnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031963; a=rsa-sha256; cv=none; b=t1gs2tIMoE4f+hyPzfwlkHrlJoRjqxVyxjO/Ves/AnRppD+AXKp5D9YcSBPgXk/Bo8e60s qIkLJqGSwIS7XF5P9wwYwQT7/BSPCvcUmZTqmSDI3XeePr7U92PUIfhZ87ajQXJU+aFHBj yDlF9LqQjaMHLv/+yepuoTxTBeF7vs8ljypbKpgazVO97UF6GBQjMNyI4CgEbSnHvKX40j CiwBsFhfybdJ0mcUREp+B3PlquegsQ5YsBvQUYOJI9LCu9Sbm0gtjrA4a9lYhTLbM7WE1o ZVWhIKaVQDmSE0QXXSC1S8WRzNgzzNDxpizad7gQCrS6NUGE8hZeZn+9B1uGEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDyz0Qr8zg90; Tue, 23 Jan 2024 17:46: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 40NHk2Yx076097; Tue, 23 Jan 2024 17:46:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHk2KU076094; Tue, 23 Jan 2024 17:46:02 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:46:02 GMT Message-Id: <202401231746.40NHk2KU076094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a3d6e0de1c89 - main - powerpc: Fix bus_space_unmap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3d6e0de1c89c145b40ed80fe54c6bad1abbf416 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a3d6e0de1c89c145b40ed80fe54c6bad1abbf416 commit a3d6e0de1c89c145b40ed80fe54c6bad1abbf416 Author: John Baldwin AuthorDate: 2024-01-23 17:37:53 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:37:53 +0000 powerpc: Fix bus_space_unmap Previously it failed to compile since the macro passed too many arguments to the function. Fix by adding the bus handle to the function and adding an implementation that calls pmap_unmapdev. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D43440 --- sys/powerpc/include/bus.h | 2 +- sys/powerpc/powerpc/bus_machdep.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h index 6e91900c236d..ddb4737d9b76 100644 --- a/sys/powerpc/include/bus.h +++ b/sys/powerpc/include/bus.h @@ -103,7 +103,7 @@ struct bus_space { /* mapping/unmapping */ int (*bs_map)(bus_addr_t, bus_size_t, int, bus_space_handle_t *); - void (*bs_unmap)(bus_size_t); + void (*bs_unmap)(bus_space_handle_t, bus_size_t); int (*bs_subregion)(bus_space_handle_t, bus_size_t, bus_size_t, bus_space_handle_t *); diff --git a/sys/powerpc/powerpc/bus_machdep.c b/sys/powerpc/powerpc/bus_machdep.c index 39096edfc1f7..e908750961d0 100644 --- a/sys/powerpc/powerpc/bus_machdep.c +++ b/sys/powerpc/powerpc/bus_machdep.c @@ -140,8 +140,13 @@ bs_remap_earlyboot(void) } static void -bs_gen_unmap(bus_size_t size __unused) +bs_gen_unmap(bus_space_handle_t bsh, bus_size_t size) { + + if (!pmap_bootstrapped) + return; + + pmap_unmapdev((void *)bsh, size); } static int From nobody Tue Jan 23 17:46:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDz15p9yz57mp8; Tue, 23 Jan 2024 17:46: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 4TKDz13DV9z47QF; Tue, 23 Jan 2024 17:46:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9JvW26eNviNEr+zHlxKa3/aIjLHIh6o5RjwI0QhcWX0=; b=PrW/jptxBRcbQBElce7SwepHOaoL/izTmLZiw2i8VQrOQpD2R6yAl9vB9miwjef4eVil42 lM4bmbPcYvovONZlVNkhl5o5RADFZHIt3MQZsupwBXEDmsQrQ2mOYhVIKgZBs/1hOtqz+d HkPCRdny0A4WxA4aIl1/WmRNNw8nNfu7gk5wFmjEgTvQ/Tp57HQ1kfIcHdIi3NaedtFJ9l upsty7vu3bBn7eBhjGAqHnDZiZduAhu16SsfKWJ1eGBoIJ09yf3dJPMthTvnvFBMNrpkDG 8+clpsq3veukf7WVAzHke3dtcR3WKC5Zq7HexGlqAZ4vrbOKemfLcZtpiGkC5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9JvW26eNviNEr+zHlxKa3/aIjLHIh6o5RjwI0QhcWX0=; b=smSp9jcwcFOY7VKPHbmtxoVgEWwPw4JktOB1tXPucPrvWpRODKuYFo1wDHL/TqXEiER0iL 7lGYUOAXLVziflfMIToSzdoF2rftZFHTKn4HgbEkvIPWFpB8S2w7b/jhm5VVQuy65WELhR 7V98LFAmLaZhUU5L52kwU1XXwoMRtf6sGkjuDIfGa8KGUvnCYLJ9NpopTY6P49iVhRVef3 lTrLVAMSqPwuqiabq+c68FErBGGEn28ycUbsEb8VXpR0jx3NPQ85H4wFjkrrJrMVeWADkG nJ6YvGPFUpUm+7JgvNMe+r9zOYOgu+M1LvdxI5WnHvYuGsmHZQy1K2EzgTWcmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031965; a=rsa-sha256; cv=none; b=iRlFHaDGlYxOO1GVUKko+i/dhelWd4mCP1R+sUYoFwtMlZBFSjeJtMWPmahI0WTC55Vf7o KNeFCWjqrpFerdVlkb+nwb/UxywIAoj278CuX86C6gh9ZtCbwTLiC/Tm50m8Tao30UptBH qC9HtyNBbzkRd6cVLxPM2KH6Bit+947ZJ21Toai20M03FrqIUYVpNzbtHAMK9O/98vO0mw jNeySa97F3+6WXWTJMTerkN7EXUoPFCLtrA28UAHl34sRX0Bvj5QFpwcV/XPXOiBBRvMbR RKIqiHqs97DqjqVR2S6MqbI0HGY1a78AfTwYR941vmCMWheimGftgesprfVRRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDz12FJtzfpS; Tue, 23 Jan 2024 17:46: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 40NHk5v6076178; Tue, 23 Jan 2024 17:46:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHk5Vn076175; Tue, 23 Jan 2024 17:46:05 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:46:05 GMT Message-Id: <202401231746.40NHk5Vn076175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3cf553288b96 - main - simplebus: Consistently map SYS_RES_IOPORT to SYS_RES_MEMORY List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cf553288b968106e40882bb73b30da652614ba0 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3cf553288b968106e40882bb73b30da652614ba0 commit 3cf553288b968106e40882bb73b30da652614ba0 Author: John Baldwin AuthorDate: 2024-01-23 17:38:25 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:38:25 +0000 simplebus: Consistently map SYS_RES_IOPORT to SYS_RES_MEMORY Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43442 --- sys/dev/fdt/simplebus.c | 90 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 83 insertions(+), 7 deletions(-) diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c index 25d6fa51fc51..bf6fceb48a9c 100644 --- a/sys/dev/fdt/simplebus.c +++ b/sys/dev/fdt/simplebus.c @@ -46,6 +46,19 @@ static int simplebus_probe(device_t dev); static struct resource *simplebus_alloc_resource(device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int); +static int simplebus_adjust_resource(device_t bus, device_t child, + int type, struct resource *r, rman_res_t start, rman_res_t end); +static int simplebus_release_resource(device_t bus, device_t child, + int type, int rid, struct resource *r); +static int simplebus_activate_resource(device_t bus, + device_t child, int type, int rid, struct resource *r); +static int simplebus_deactivate_resource(device_t bus, + device_t child, int type, int rid, struct resource *r); +static int simplebus_map_resource(device_t bus, device_t child, + int type, struct resource *r, struct resource_map_request *args, + struct resource_map *map); +static int simplebus_unmap_resource(device_t bus, device_t child, + int type, struct resource *r, struct resource_map *map); static void simplebus_probe_nomatch(device_t bus, device_t child); static int simplebus_print_child(device_t bus, device_t child); static device_t simplebus_add_child(device_t dev, u_int order, @@ -83,10 +96,12 @@ static device_method_t simplebus_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, simplebus_alloc_resource), - DEVMETHOD(bus_release_resource, bus_generic_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), + DEVMETHOD(bus_release_resource, simplebus_release_resource), + DEVMETHOD(bus_activate_resource, simplebus_activate_resource), + DEVMETHOD(bus_deactivate_resource, simplebus_deactivate_resource), + DEVMETHOD(bus_adjust_resource, simplebus_adjust_resource), + DEVMETHOD(bus_map_resource, simplebus_map_resource), + DEVMETHOD(bus_unmap_resource, simplebus_unmap_resource), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_child_pnpinfo, ofw_bus_gen_child_pnpinfo), @@ -432,6 +447,9 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid, sc = device_get_softc(bus); + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + /* * Request for the default allocation with a given rid: use resource * list stored in the local device info. @@ -440,9 +458,6 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid, if ((di = device_get_ivars(child)) == NULL) return (NULL); - if (type == SYS_RES_IOPORT) - type = SYS_RES_MEMORY; - rle = resource_list_find(&di->rl, type, *rid); if (rle == NULL) { if (bootverbose) @@ -480,6 +495,67 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid, count, flags)); } +static int +simplebus_adjust_resource(device_t bus, device_t child, int type, + struct resource *r, rman_res_t start, rman_res_t end) +{ + + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + return (bus_generic_adjust_resource(bus, child, type, r, start, end)); +} + +static int +simplebus_release_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + return (bus_generic_release_resource(bus, child, type, rid, r)); +} + +static int +simplebus_activate_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + return (bus_generic_activate_resource(bus, child, type, rid, r)); +} + +static int +simplebus_deactivate_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + return (bus_generic_deactivate_resource(bus, child, type, rid, r)); +} + +static int +simplebus_map_resource(device_t bus, device_t child, int type, + struct resource *r, struct resource_map_request *args, + struct resource_map *map) +{ + + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + return (bus_generic_map_resource(bus, child, type, r, args, map)); +} + +static int +simplebus_unmap_resource(device_t bus, device_t child, int type, + struct resource *r, struct resource_map *map) +{ + + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + return (bus_generic_unmap_resource(bus, child, type, r, map)); +} + static int simplebus_print_res(struct simplebus_devinfo *di) { From nobody Tue Jan 23 17:46:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKDz25FQFz57mrc; Tue, 23 Jan 2024 17:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKDz23hnMz47W6; Tue, 23 Jan 2024 17:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kh0nIWwLaWLdlU0CmJi9NHDz5oSnyHiF1Pk6JGDHHPk=; b=D+wCXWWYZCodAvcENQM7tcGg0fowX6sS/sSQqIJRSRO7pjDPdThrL5Bak5A6ZE4K0j++CZ RuKWCQp/5PlsUxFVbcQXt07Q81+dS7tfbQz28r3K/dzqKDjnI6ESZTnH3Bqc5vo9nTfQPf mKFW26TdS/PgQgN99NGiB0B3u6GLRsF5MYt/1oYznVU0tXLpqqCBL1+mThkyQ7B8KQ3tr2 tk/gQnFe+btvFs+a1hW5OC8xO8ou4NeDEOJjrDQka8fqVPESCfr3707NswmI2wNcHKTQDu Qx6NoXUDxQK7EWSzTzHDMIRal8MThoE/i2Z1eeB/dfo5o5S4i9mabS3r4I8EbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706031966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kh0nIWwLaWLdlU0CmJi9NHDz5oSnyHiF1Pk6JGDHHPk=; b=kVwsqnifITHjasZN0NvPryeXmf0OuCbUyQ41Nmb8zslA16ky2ZjyAqYcvbXXWJb4YbqPUW JvgOHrtVSIBKs2zSQQnnT3J2DkfVprTMSQWSA/fgc33fX5RWcYlJVpeCb0ufKjDVFJtUrf TJOencEn9qSdNQRD2oCRyjoYf+Da7ne+bKdn3Wi4PWueKv8kO9xqs8SwKrtic/W7wZymEy 0SvpHIYFi/6nDc9HjoBPICTGY2SfIf9KLocxa0WZQH9Wj+lB/ci20fjkrbec7Ms+bi7GU0 v83dDAe2EjVKlqpmrwbTlJDScxJ3AR5Ks267EBdubg5cZnS/yzYEg0gPVEmTfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706031966; a=rsa-sha256; cv=none; b=bjFljY0tOQN0MbQly84N9ZHbuWXPQak5Tr1YPP1u1O5H1b1ERX7l/U4XS8C4A/cDewxWHn jSWnD7RJLM1FpIhpkri9aZso19wjcvNgjUNhMc2M8QZqFz/ftAItlh6u6ZSOMiKVsflxs0 ibmmsJw4QFSsL042tsrrGnJcrcNO4zkv9sZwm8kMq+jM9aEsTaMDicO46Oj3Fq+iaPSDdc 6TGKbKaGl6m7jnBpCp5oMLiq5C4vpot6f6DDGGL2eP4U2TaJOY2ynB9PHuzBRnCfeCaKnl btLd60vAYW/iaYfXkLA2ltjg+ErTBSkAYASoaDjLj1QG68rXpSBgdmPWpwgZfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKDz22pyGzgcP; Tue, 23 Jan 2024 17:46: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 40NHk613076226; Tue, 23 Jan 2024 17:46:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NHk6F6076223; Tue, 23 Jan 2024 17:46:06 GMT (envelope-from git) Date: Tue, 23 Jan 2024 17:46:06 GMT Message-Id: <202401231746.40NHk6F6076223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a82470212b76 - main - powerpc: Add RF_LITTLEENDIAN resource flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a82470212b7659afb7d3287e2ccae72d5e496b71 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a82470212b7659afb7d3287e2ccae72d5e496b71 commit a82470212b7659afb7d3287e2ccae72d5e496b71 Author: John Baldwin AuthorDate: 2024-01-23 17:38:36 +0000 Commit: John Baldwin CommitDate: 2024-01-23 17:38:36 +0000 powerpc: Add RF_LITTLEENDIAN resource flag If this powerpc-specific flag is set on a resource, then the little-endian bus tag is always used when mapping that resource. Make use of this flag in the mpc85xx/fsl_sata driver to avoid setting the SATA BAR's bus tag after bus_alloc_resource. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D43553 --- sys/powerpc/include/resource.h | 7 +++++++ sys/powerpc/mpc85xx/fsl_sata.c | 3 +-- sys/powerpc/powerpc/nexus.c | 10 ++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/powerpc/include/resource.h b/sys/powerpc/include/resource.h index 9477572176e0..e7e9493569cc 100644 --- a/sys/powerpc/include/resource.h +++ b/sys/powerpc/include/resource.h @@ -41,4 +41,11 @@ #define SYS_RES_IOPORT 4 /* i/o ports */ #define PCI_RES_BUS 5 /* PCI bus numbers */ +/* + * A powerpc-specific resource flag to request little-endian bus tags + * for a resource. + */ + +#define RF_LITTLEENDIAN RF_SPARE1 + #endif /* !_MACHINE_RESOURCE_H_ */ diff --git a/sys/powerpc/mpc85xx/fsl_sata.c b/sys/powerpc/mpc85xx/fsl_sata.c index 861aaba530e3..74fc40053fdc 100644 --- a/sys/powerpc/mpc85xx/fsl_sata.c +++ b/sys/powerpc/mpc85xx/fsl_sata.c @@ -352,9 +352,8 @@ fsl_sata_attach(device_t dev) } ch->r_mid = 0; if (!(ch->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &ch->r_mid, RF_ACTIVE))) + &ch->r_mid, RF_ACTIVE | RF_LITTLEENDIAN))) return (ENXIO); - rman_set_bustag(ch->r_mem, &bs_le_tag); fsl_sata_dmainit(dev); fsl_sata_slotsalloc(dev); fsl_sata_init(dev); diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 3c71e1e79e3b..55afadcb4e20 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -275,14 +275,20 @@ nexus_map_resource(device_t bus, device_t child, int type, struct resource *r, panic("%s:%d SYS_RES_IOPORT handling not implemented", __func__, __LINE__); /* XXX: untested map->r_bushandle = start; - map->r_bustag = nexus_get_bus_tag(NULL, NULL); + if ((rman_get_flags(r) & RF_LITTLEENDIAN) != 0) + map->r_bustag = &bs_le_tag; + else + map->r_bustag = nexus_get_bus_tag(NULL, NULL); map->r_size = length; map->r_vaddr = NULL; */ break; case SYS_RES_MEMORY: map->r_vaddr = pmap_mapdev_attr(start, length, args.memattr); - map->r_bustag = nexus_get_bus_tag(NULL, NULL); + if ((rman_get_flags(r) & RF_LITTLEENDIAN) != 0) + map->r_bustag = &bs_le_tag; + else + map->r_bustag = nexus_get_bus_tag(NULL, NULL); map->r_size = length; map->r_bushandle = (bus_space_handle_t)map->r_vaddr; break; From nobody Tue Jan 23 18:32:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKG1X6CGkz57s9s; Tue, 23 Jan 2024 18:33:20 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKG1W294Dz4L3M; Tue, 23 Jan 2024 18:33:19 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=uBGZKIji; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 94.130.200.20 as permitted sender) smtp.mailfrom=herbert@gojira.at Date: Tue, 23 Jan 2024 19:32:46 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1706034791; bh=G+SW1+zH+eCVecoAcAA37puPoTSwn3ytg/0PFtvtzU8=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=uBGZKIji2p24vGAMmijCYUGQonHFpeNtyig6uzd+qja2+R9BnQKbmxjFCyY3YqP1r 5HC5gl2Uo4udLcNbm5Djq1a6AFZqlw2xfutmBBIQ7p1jrpwNsF1hRiMUPnjSizg+3f YH28htHHqcZH0mn/VWmNRi2+4vrLbaqxZKcqJosmDa7jETO4AVg8+fHYVuiaNFprD0 Oycm4phL/sGaa+k8A29jZRkc7CSOc2diL8HcHhM+jTdFeiuwTQePSCBiVAt49fPx+T 9SZyFmnjo2zCQOEhAGYeOpIQjbqgUt+yzpWgSZ/sn58MIkudtjYtMd+TYDJiWtmKkf 2GU7y/Ben4kmg== Message-ID: <87v87jkii9.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Kristof Provost Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 54c62e3e5d8c - main - pf: work around icmp6 packet-too-big not being sent when binat-ing In-Reply-To: <202401221252.40MCqpf6047526@gitrepo.freebsd.org> References: <202401221252.40MCqpf6047526@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/29.2 Mule/6.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_ALLOW(-0.20)[+ip4:94.130.200.20]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; DMARC_NA(0.00)[gojira.at]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; DKIM_TRACE(0.00)[gojira.at:+] X-Rspamd-Queue-Id: 4TKG1W294Dz4L3M On Mon, 22 Jan 2024 13:52:51 +0100, Kristof Provost wrote: > > The branch main has been updated by kp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=54c62e3e5d8cd90c5571a1d4c8c5f062d580480e > > commit 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e > Author: Kristof Provost > AuthorDate: 2024-01-17 17:11:27 +0000 > Commit: Kristof Provost > CommitDate: 2024-01-22 11:52:14 +0000 > > pf: work around icmp6 packet-too-big not being sent when binat-ing > > If we're applying NPTv6 we pass a packet with a modified source and/or > destination address to the network stack. > > If that packet then turns out to be larger than the MTU of the sending > interface the stack will attempt to generate an icmp6 packet-too-big > error, but may fail to look up the appropriate source address for that > error message. Even if it does, pf would still have to undo the binat > operation inside the icmp6 packet so the sending host can make sense of > the error. > > We can avoid both problems entirely by having pf also perform the MTU > check (taking the potential refragmentation into account), and > generating the icmp6 error directly in pf. > > See also: https://redmine.pfsense.org/issues/14290 > Sponsored by: Rubicon Communications, LLC ("Netgate") > Differential Revision: https://reviews.freebsd.org/D43499 > --- > sys/net/pfvar.h | 1 + > sys/netpfil/pf/pf.c | 12 ++++++++++++ > sys/netpfil/pf/pf_norm.c | 15 +++++++++++++++ > 3 files changed, 28 insertions(+) Does this change cause problems for others too? - ssh over IPv6 permanently disconnecting (client_loop: send disconnect: Broken pipe) - ssh connections over IPv6 hanging - git pull not working Fssh_ssh_dispatch_run_fatal: Connection to 2604:1380:4091:a001::24ca:1 port 22: Permission denied fatal: Could not read from remote repository. Thanks. -- Herbert From nobody Tue Jan 23 18:40:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKGB03T8Mz57sNN; Tue, 23 Jan 2024 18:40: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 4TKGB02sJBz4Ltn; Tue, 23 Jan 2024 18:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706035240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vfjL2h6ZWluLrKk7tBLv/kOjSjth4/26QYLqCqMUkk=; b=s3FMo8vEJdgI2OrNlAFygmUHsp7vn3SGa1v8Um3CVx4O2H1YLmX0uQ9yElKn+FpE58Iq7t T1KRloZ+3rzR7Np3jziNiF90un02w272DexS+anLEBMeeQUu2k+AHic0Pf6ui8jA/Aj+s8 Pwnr78Wke51AcQHoFyxRhqvyjkG/pJFjnsi4CdtxcL2jJJqM50ml9PTNZrdSYUAkertFhv XDlXjA7x0VZf6qSxlS6cfwaO+Q8s5yFzLO9fWo7BhgdltVY1ByRJHwcJk+fRzma9Lgg6MM nd2/YUQFq6moUZ0r46dAW8jlGs/RgxvXwwN5nHV+//CZRmL0Ei9FJvd+k5uLHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706035240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vfjL2h6ZWluLrKk7tBLv/kOjSjth4/26QYLqCqMUkk=; b=jqRb4d4EPNFb0hkLwV1W3sYuoAbs/3JcsVZBxCqrEzCJ1cQpWGfaNnKFtUtk3EAHW/MMxb tR9ggadE4WjERH6TG1YZFPt/0FGab3H5PYz3b/koaDpGmIFH1BserJPxVoHUkCBsa8dOPW DLaeQ8IclDM3G5qnbWjKHjKkhR1A19AXSeVq1Oq0Q8hTyVeLcgbLTA3gz80DP0H6XVBBJu qMyVxeCVoyjI0xoQpOBOm7kbs8sXlXkLng/z39/k0Qfkoj6UaRJRiZngqX9mqR9lt5HW5t 79XRaOsgP9P7bk/e2Vcjt0QiQ58QXaw/fFQBD2BUaJC2crWC1QinV7LjbslAhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706035240; a=rsa-sha256; cv=none; b=il5TUDRnBYJO5/1zcjjpN/arkMZXoj9L7Cu6ZHOwFpc8qPoj0F1I5Bfx+Hvd8WBX6zKJzi BOpzwvQd51+wq9jQToBWNOMYZdKQRmn8YiNdlRGj1n8NZcdjC2ExMcOopeQ+rcINXZX7Gy i8bkAXAEs/cCWSqm3u0WREq+WIm6uHC5EJl7wfn1Ef8Jv8dzMdPwNaNpqDhd8gGXuBK5yW vQeNbFZZEDH5xnomEejK8lEW/QHfjwRIoSRowpHkkWYSZMW+Bn7eAzYv2wKu+0LraJ+BMB GuEyx1HGtvJqxqrtZf7I5Nj9MVj5IfyrmnoeAZeFl8gyBq4lqY+FciH8GKTYQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKGB01wj7zj0r; Tue, 23 Jan 2024 18:40: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 40NIeeIH072726; Tue, 23 Jan 2024 18:40:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NIeeGx072723; Tue, 23 Jan 2024 18:40:40 GMT (envelope-from git) Date: Tue, 23 Jan 2024 18:40:40 GMT Message-Id: <202401231840.40NIeeGx072723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 2acd158d4b0e - main - mtree: stop creating old mixer(8) test directories List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2acd158d4b0ec832d54f69c7b245a688c612685f Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2acd158d4b0ec832d54f69c7b245a688c612685f commit 2acd158d4b0ec832d54f69c7b245a688c612685f Author: Dimitry Andric AuthorDate: 2024-01-23 18:40:01 +0000 Commit: Dimitry Andric CommitDate: 2024-01-23 18:40:12 +0000 mtree: stop creating old mixer(8) test directories The tests themselves were added to ObsoleteFiles.inc in commit f7c4f4964971, but not yet removed from BSD.tests.dist. PR: 274602 Fixes: f7c4f4964971 --- etc/mtree/BSD.tests.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 8d9335ac711b..660883ed848a 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1225,8 +1225,6 @@ .. makefs .. - mixer - .. newsyslog .. nmtree From nobody Tue Jan 23 18:42:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKGCp2ZbDz57t3D; Tue, 23 Jan 2024 18:42:14 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKGCp28Yzz4MQn; Tue, 23 Jan 2024 18:42:14 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706035334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XDdneEaffM/ExrqaNv2RfRPKd+oKiEYd4WWFPlgtbQ0=; b=EPLKbzBbugK65nG8NUpomAUmnX+LVhyBvEPZPkigzDS6dQrZUWXdmEHEcnCKuJkr+ckab0 gauzgddrETucygGqsFQ0FH22JQ/H7O7UeWoE6rkUlFVebtWtArtY/95udMnvU0Uw23IiG+ 8cA1p4mtM4shjYzuckjhU6elcf8TaBDDISG5q0Ib5z7Qt4fMmEgeqZ0sduNGwk491pvPpB QdyV8UT20Iuc2yhL3cIjr7fy8b7FAWs7IRBIziGr/XCVthBsdN+LzM4VAiUUGnXDdo2IYU QnfGgCzC69qwntUuVESnk+p8Evw8PccuKgNIky+MiXcogKuZxkkxF1KqNKopEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706035334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XDdneEaffM/ExrqaNv2RfRPKd+oKiEYd4WWFPlgtbQ0=; b=EgneBWOlibvclG069nFFqblpMymj33FCg4Wcs+mMLLj/KWbhLNEyHkxlSHF9YMtErGjy4g jplMRQnmLYHnYiXpUW1QRtndd1LpgeWYoGgxh2OtfORMf1FmC1mClbrVPKcaLO/88XTdyR 1GI2kcxp9eLKa5y9NHSTXykNcEHARugC9MLkiVFJldyFfdaU0ohMN9g17gzJE3ZECC+0xV uJmRgUd/8eO5jbD3KKE0mq9b05nttlNxwF04Qq2BeFS3xDcYJW+BtT/nY6S0CPPTedT26j EAMVJ6pqrSoxzf69xaXrkAF90irMs/it3TeSHpo1TsuvU/bEiZQGeb+ArGr1tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706035334; a=rsa-sha256; cv=none; b=N+rg3G2JbTxLv4hWp0+vP2jownpdUnNKYmbMkKKHDllmUrwEmXh5C8mAcd7Tt7fWryd7Ur mWurqRPe1W9YhBlcRAYZwj5mjcXalQPRRaPLR2n+c7ttDpR7q3XPxawjjkatsC+NYqknxi KVrlbIf2RoFI5JnrHEMTUaVXRGJ1J2TjrqTry8Lp4OMuF+ufyWLYfYBrP99tLryL51zyiZ yD11y4bygZMBdQSBKFWa8uLQQKehyTb8YacFDlibrUf+TPjVsPWjdoCKvnrFsHDUw0jZTk 0nIfEsrKYeaUe3A/Vtmr7Y9pOvm6dxeYPySRKVQExZWyXnItQ20sGbitkk9ZMw== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TKGCp0V8yz1Q3F; Tue, 23 Jan 2024 18:42:14 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 75F5E1194F; Tue, 23 Jan 2024 19:42:11 +0100 (CET) From: Kristof Provost To: "Herbert J. Skuhra" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 54c62e3e5d8c - main - pf: work around icmp6 packet-too-big not being sent when binat-ing Date: Tue, 23 Jan 2024 19:42:10 +0100 X-Mailer: MailMate (1.14r5937) Message-ID: <1E1C3472-0AF3-457B-A27A-89679770EA62@FreeBSD.org> In-Reply-To: <87v87jkii9.wl-herbert@gojira.at> References: <202401221252.40MCqpf6047526@gitrepo.freebsd.org> <87v87jkii9.wl-herbert@gojira.at> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 23 Jan 2024, at 19:32, Herbert J. Skuhra wrote: > On Mon, 22 Jan 2024 13:52:51 +0100, Kristof Provost wrote: >> >> The branch main has been updated by kp: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D54c62e3e5d8cd90c5571a1d= 4c8c5f062d580480e >> >> commit 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e >> Author: Kristof Provost >> AuthorDate: 2024-01-17 17:11:27 +0000 >> Commit: Kristof Provost >> CommitDate: 2024-01-22 11:52:14 +0000 >> >> pf: work around icmp6 packet-too-big not being sent when binat-ing= >> >> If we're applying NPTv6 we pass a packet with a modified source an= d/or >> destination address to the network stack. >> >> If that packet then turns out to be larger than the MTU of the sen= ding >> interface the stack will attempt to generate an icmp6 packet-too-b= ig >> error, but may fail to look up the appropriate source address for = that >> error message. Even if it does, pf would still have to undo the bi= nat >> operation inside the icmp6 packet so the sending host can make sen= se of >> the error. >> >> We can avoid both problems entirely by having pf also perform the = MTU >> check (taking the potential refragmentation into account), and >> generating the icmp6 error directly in pf. >> >> See also: https://redmine.pfsense.org/issues/14290 >> Sponsored by: Rubicon Communications, LLC ("Netgate") >> Differential Revision: https://reviews.freebsd.org/D43499 >> --- >> sys/net/pfvar.h | 1 + >> sys/netpfil/pf/pf.c | 12 ++++++++++++ >> sys/netpfil/pf/pf_norm.c | 15 +++++++++++++++ >> 3 files changed, 28 insertions(+) > > Does this change cause problems for others too? > > - ssh over IPv6 permanently disconnecting > (client_loop: send disconnect: Broken pipe) > - ssh connections over IPv6 hanging > - git pull not working > Fssh_ssh_dispatch_run_fatal: Connection to 2604:1380:4091:a001::24ca:1 = port 22: Permission denied > fatal: Could not read from remote repository. > Can you include your pf.conf and a packet capture demonstrating one of th= ese issues? Best regards, Kristof From nobody Tue Jan 23 18:46:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKGK52Lwfz57tDL; Tue, 23 Jan 2024 18:46: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 4TKGK51wC0z4N4T; Tue, 23 Jan 2024 18:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706035609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9N2OwmjHU3Mlqm3uILWzcj2AVycOGsOBLcRAQctbbcg=; b=JIbKE+ZQdleCjBB6lDbUulB+UrESh/Hh/R5pupcgo4NdN0/ju8z1gApKpq0l97p+Ee1UDj vQU1nQa3dmLCNFUjXZDOZm8DajpVRziv7tahJmYmb4L4KwM5dAO1ONMUhq1RsGhvxbEn66 hP83UliLBvDQksELj2k/sJb+1HzCRsOT40GhlP9jvWNhzSVCmwiIsiFQK4lae8lLrQQyvS CxSEdAUJGMHnlXB59n/5UEif62+Xck0dH45LcZ8CbWzMOlhjeHfGqfyAl75CV5rHbqs4RP VKkRUQJ5/WrvwSv+UMjG/YIB08jNTGfT0ecwh/f6cptt8O/xNB7+Q66Eq2Mmbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706035609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9N2OwmjHU3Mlqm3uILWzcj2AVycOGsOBLcRAQctbbcg=; b=P69dBipU7PoA0GX2T5SbQHO50Ydjc06ZWf1IgAsJ/UTLFwVg4fBXUudKX26dMPAWCyH3mu ZS17f39Bco62AvMa+iHK694CCl6+RKNmo1LGXq9GeFbtdmgY7YctQXXjSmSfT08i3RMeBZ aK7sG8dJPG7g0hV3iuUwbMmkbTRY37YudVoWnS8bvtD4gSRhrwvfjKTMT0bczPWxzQso5w g8v3zMpVnI9amGAHkeTJlzzCZ+dzUkg6fcYCRGdra9jZoAXvvGyxmBY8sQ5JjQyb0/cV3O lff5qF45uQk6EvBL4tSIAQuwA+DerKaAJmp+Vo3zNbFr8Fz/qR7lW+gow8NLYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706035609; a=rsa-sha256; cv=none; b=QVeWpdMZhhP4sHGmXRoiwzMRdDgFStpwquF7vEkGAviPzIHuPJhni/vtkhTr8bPS0kYEx7 ea2jHeeXmzRHZTIHgUCysaQVM94Ugrf0PZErPNwEpHMVL/iy0v5X9MidjwEXxxMiC8nJ8U ZN3pSGrxS5bSpLw2GYZytx1QJiQX7P4Wsd/bPPisW1asFi2kCfY4sOKG+wtUssPhBEdvWn L0W51+Ytms/pJj8D7DoZTwcePab7jwrtzmaP41B68CY8kES9knbF1C2I5QgaWvv2+Ja029 fZ2OFKRUC4V3/oXC0t5B5Dq00eOqlioa9ZRVlIxPTkE/ZiG3xq+naH0+ychaFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKGK50yvXzj1h; Tue, 23 Jan 2024 18:46: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 40NIknv6079170; Tue, 23 Jan 2024 18:46:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NIknvw079167; Tue, 23 Jan 2024 18:46:49 GMT (envelope-from git) Date: Tue, 23 Jan 2024 18:46:49 GMT Message-Id: <202401231846.40NIknvw079167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 2e68c5a44c40 - main - tmpfs: increase vfs.tmpfs.memory_percent to 100 as workaround List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2e68c5a44c40848c43849cc3650331cf82714dfa Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=2e68c5a44c40848c43849cc3650331cf82714dfa commit 2e68c5a44c40848c43849cc3650331cf82714dfa Author: Mike Karels AuthorDate: 2024-01-23 17:23:38 +0000 Commit: Mike Karels CommitDate: 2024-01-23 18:46:31 +0000 tmpfs: increase vfs.tmpfs.memory_percent to 100 as workaround The changes to avoid letting tmpfs use all of memory + swap do not work well with ZFS ARC. The ARC can grow quite large, and will shrink when there is memory pressure, but tmpfs does not allow for that. Pending investigation of the right way to handle this, change the default value of the vfs.tmpfs.memory_percent sysctl to 100 as a workaround. The sysctl can be set to 95 to get back to the previous default. --- sys/fs/tmpfs/tmpfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h index 5c86a386b9da..c28f3a02a7bf 100644 --- a/sys/fs/tmpfs/tmpfs.h +++ b/sys/fs/tmpfs/tmpfs.h @@ -548,7 +548,7 @@ tmpfs_update(struct vnode *vp) * without a size limit. */ #if !defined(TMPFS_MEM_PERCENT) -#define TMPFS_MEM_PERCENT 95 +#define TMPFS_MEM_PERCENT 100 #endif /* From nobody Tue Jan 23 19:11:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKGs655Pnz57w3p; Tue, 23 Jan 2024 19:11:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKGs64SPsz4QFX; Tue, 23 Jan 2024 19:11:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706037066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FFGnkOqIcxxuXLo5ZtzsNP2CBsexbd4RpQeFJheuTK0=; b=bB6V0Ao3y1MXiN0lNCILI2UcnO3tVSbGP+8VH7fdsfcr7tXVCeH2JWDmvta5I7MUzjmwR4 6UJIRiRnBlavb3ndNWD/IT2YDG6DgiX/afznLJvgoVan7NRf973ZrzjZM2HPhvVQESEhMB jJrT7fUU1ilm1lMAO7yl2NGPeMp4fMtNfbnA7y8+iTswQefJadJZQo3vr2Vxc/o3X0XEhR EyFrJwXRDBKzIye8azamGL165NM2TwSmjVsCnSN8TPNTB7Ovwmv1kQF2321A3FspwQTnx8 NY/bq39pse8FuJCc5/H0Mph1YmVd638S8A5irrGpshaXyHy39L8xAQkmjuyxgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706037066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FFGnkOqIcxxuXLo5ZtzsNP2CBsexbd4RpQeFJheuTK0=; b=Y8b9EkkthddlhLoEOmRVp8yMXiAoNFCWWy79MdWA85EF6owCIlbAF1X/JBqHOmaOpKDNYW jzRtzygD1Jn95q+dCj2yOcNZF5OFNXkUu0+jqSJ7oHoiERKn2AC7AypjnndDiGTD7RQ7mv lEl1q4LIRPP30iEtnlR1kYVqvWgYrrgypClmQV/+GNEQD5Lp5xfa2ZhQAIaF1hSKN/ny4W UicNqMQTmkZ4iaD5bAoeVwOXSxHzz/u7bcMpxBBsfJO98ywDPMJ/sU1M7poCmh2nlORanS izMlzqCkoxMhciYqLdZc8dTv7Q6xzNz9Ie6hAiCD2B74qbMpXOxFZLx//dBo6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706037066; a=rsa-sha256; cv=none; b=p5RcCjMSnp4LuZlUN/ZtNTOceXsPVID4mnzlMVWPGd1Ypyjeuf6YL9XJyMQpx0pMARQ9W4 PUps0fITyT2C7D0171d/AYu0fjZpFrgHYuFDoSZ9AaGZxjbm84Gzsp0iJt/wfdlebOhxku P96t61+IMRYeZxVWxPctlC0BlevQADrQJuKI6Ut3tG0RYqZEdi+hn3YG8mak4VSAXheK2J djqtTUIOg6T5cR5F4RApK2asTD7cybLlDAv6v4GHBZAxkuSjZELODjGv9S6GTqeF4KZmB6 U56e6g2UmWumVhjVfhIpGYDG++DQoHVkYZaxFKTWahYB+X/qh0TCSsCkEc+Zfg== Received: from [IPV6:2601:644:9381:f410:f853:1fbd:e52f:2b03] (unknown [IPv6:2601:644:9381:f410:f853:1fbd:e52f:2b03]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TKGs60Xghz1RMX; Tue, 23 Jan 2024 19:11:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <8e2f70e3-c2b3-4105-90b4-660f0cc1f0f3@FreeBSD.org> Date: Tue, 23 Jan 2024 11:11:04 -0800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 2acd158d4b0e - main - mtree: stop creating old mixer(8) test directories Content-Language: en-US To: Dimitry Andric , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202401231840.40NIeeGx072723@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202401231840.40NIeeGx072723@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/23/24 10:40 AM, Dimitry Andric wrote: > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2acd158d4b0ec832d54f69c7b245a688c612685f > > commit 2acd158d4b0ec832d54f69c7b245a688c612685f > Author: Dimitry Andric > AuthorDate: 2024-01-23 18:40:01 +0000 > Commit: Dimitry Andric > CommitDate: 2024-01-23 18:40:12 +0000 > > mtree: stop creating old mixer(8) test directories > > The tests themselves were added to ObsoleteFiles.inc in commit > f7c4f4964971, but not yet removed from BSD.tests.dist. > > PR: 274602 > Fixes: f7c4f4964971 Sigh, I had removed these once already: commit 7aa3bf6952b2c7d1b02d3a67e7f51b96fcf52b50 Author: John Baldwin Date: Thu Nov 23 12:17:41 2023 -0800 etc/mtree: Remove entry for /usr/tests/usr.sbin/mixer These were removed when the new mixer(3) library was imported, and I missed updating the mtree file when I added the entries to ObsoleteFiles.inc. Fixes: 903873ce1560 Implement and use new mixer(3) library for FreeBSD. It was readded accidentally in a later change: commit b8856bd2d6acb10af236b7b8cd0cf3121da8c994 Author: Jose Luis Duran Date: Wed Dec 27 22:26:23 2023 -0700 mtree: Add missing directories to BSD.tests.dist Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/912 (In particular, emaste@ noticed they were getting recreated during 14.0 testing and ensured the first fixup commit made it into releng/14.0) -- John Baldwin From nobody Tue Jan 23 21:00:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKKGq1x7vz587dH; Tue, 23 Jan 2024 21:00: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 4TKKGq1PYQz4gQd; Tue, 23 Jan 2024 21:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706043603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WaJPeEjjWyqL+BkvgrC+2jTAjAoP/PmFmGQpv/EFE0=; b=JF6i0p/CMDCjKJohSsaRFWy8L2uukCKDfiB/tzgQQ//ZLBIQUl6smAE06RlC1v1OEOAaHv sTs7QDhfMn0eXkJcX6fie0aMg0UHMXRjciODZZeiGlPBgD/POt473ywyQ6o/WrT+V4MOGk ollKbmpYc/nMdl84zEU8miVeQOwrfZlqvnvfjXpob+YswURbaNJiHh3D8vNNN80xDFgaAp 6TqsGHzqatCpMMZ28iaRK2luHg6smHAVD7dAAR+y3NXidA823GZBoHbbvJRGsfJKXtTOsR mY6koCC2EIbL+ooty0lU1fevTtCaEhD2Ga1Hr15Qu3kb5m7z8ljRGIvOTY1dkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706043603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WaJPeEjjWyqL+BkvgrC+2jTAjAoP/PmFmGQpv/EFE0=; b=AdDeFrP1XWvDRwZYNvOewKShnq6sAiLNYtq4zwAVv+xl6pPu95ILtqcB7fizAWcQXup8ri AE+AnrNR/we7EsWQXITcnNPRLwwt5ocFWZoEdctjqsHK4tADrn9WcJumGMJLF4TfHc/xgb Yb55b5NiufjvjX1GTc9w4jwmejjT757YJePvVrf/mttiyQoFj7iCiCmQS/t4YfHU+Ui0pb 7o00bNUXff0d8Z0gwWSPuDjgnk0786jwXd/JyktHNnbT4Zfah6FT2gATmZxZ7q6ukuSV64 ppNlAknZWoBsb8ALP6vUcvGECZcNwOcTlcnfzkjfpgdqeAWWSf0eWFJ/gTtOMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706043603; a=rsa-sha256; cv=none; b=sm+O4sB/hV5VQCpDwqgfk5ngzvcm2uOrR/iRUS/bqecrcLxRef0bz0ZiEqw1C9OOeqVO3r UxIl5Jb2j2FVl0KOGbXARJKazjA8zPlOpqbWIL+Frnmj1hdCUDn/PDBGnubXmD0g4FGOeK /b7WVT8rEc9BtxZWEb9XaLY5u/G1u0GDzdskPJdUhuyW5XMA2lMCq2R+LUwM4LHqyajmhT jqoqv+QRYQY3ifiwPgbTR2E1WVxQNqBd3vLgH+ISl24H+tBQ/5YnJZikhxGyWbPXWhUUlo eOmcJqIzMyOeSlZ+zRlmZkKdA8gCil2i+U97VUoi6s6ZJyoX5+4raDVQaHWnaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKKGq0SGnzmPq; Tue, 23 Jan 2024 21:00: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 40NL03PJ003684; Tue, 23 Jan 2024 21:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NL03fr003677; Tue, 23 Jan 2024 21:00:03 GMT (envelope-from git) Date: Tue, 23 Jan 2024 21:00:03 GMT Message-Id: <202401232100.40NL03fr003677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e21c668719a6 - main - tcp: pass positive errno to tcp_drop() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e21c668719a65e119fe916f6bd22a05f33f6e315 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e21c668719a65e119fe916f6bd22a05f33f6e315 commit e21c668719a65e119fe916f6bd22a05f33f6e315 Author: Gleb Smirnoff AuthorDate: 2024-01-23 20:52:55 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-23 20:59:21 +0000 tcp: pass positive errno to tcp_drop() Fixes: 446ccdd08e2a9f704f6348cd7f679e59183b99b3 --- sys/netinet/tcp_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 125e28134c01..f0eb3bad33cf 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -299,7 +299,7 @@ tcp_output_locked(struct tcpcb *tp) KASSERT(tp->t_fb->tfb_flags & TCP_FUNC_OUTPUT_CANDROP, ("TCP stack %s requested tcp_drop(%p)", tp->t_fb->tfb_tcp_block_name, tp)); - tp = tcp_drop(tp, rv); + tp = tcp_drop(tp, -rv); } return (tp != NULL); From nobody Tue Jan 23 21:00:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKKGr2vLPz587dJ; Tue, 23 Jan 2024 21:00: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 4TKKGr1wD8z4gfC; Tue, 23 Jan 2024 21:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706043604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gl/pWXeRz+AsAslKraH9Lj+fyeJN7H7Sk9C+0S0ZB4c=; b=MOUdpFbufDGSgJ29m20zuxUNO0JpLw+FMaX7gjMVcPpBuY+gGw8hzydQBLBiwmvLpWnqB/ aJGwFS2dYTB7C/zvZjgmmtL0hZx3WJBLqxUpCRv2d60+C9MPPt7ixQOk9C2obHBBPqRd+Y aLHVj4woHA0yoIU7IQG8K5DhMX7soFeTpT9wZjRchC8zFZaTT3zoS03RfLOpVimuc8kx8y Jl+rtym+euis+Cl1TkP5yXQeTSOJFJRhSRtcTmaEn4Jnu8fP88aEoDBl5KRJlGaLDtjxGc yqkOj1q7ILGa4x5Bsn9g+IUq9OMFWmjDdQ179afXGIn0vmJG1r4hqw4Awf0soQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706043604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gl/pWXeRz+AsAslKraH9Lj+fyeJN7H7Sk9C+0S0ZB4c=; b=LVz9pnE00N7QGxp1mPa9hFvHFzCXuvStC++ncc9FMZtQ6EYGyun/pPzKIeO0byppLbT9eP Km+p/E4bwRRxVeB2FuoZcEHs/7HykVxuHZg24m2PevXMBWiCr4KjiuJsar7/5f+wZzHSvu 5IeEk0KW+C0mBlz4jSTp66Li/LQXsWOHdcKHhZn76I9R35tnTwPoqeP7fMuWmDrn4AAww/ OwafUAK8Y1HtaGRBMxlrdmYiHSKWeJ763K9rcW5qU389WapJORNE/JgOaf2RS3ag+jD3ML iPG9tBiUVKIoBqtRK9if1pOwCkKAimX/LsYy9lEIDNe9ITKspWEQgXwxs/3fAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706043604; a=rsa-sha256; cv=none; b=V5/Ho5AdBS8WhqJxDn/u5Ge7bLjUPC8qR60lx0dKOhpgarfc9uJ7jc9RBdcWW+i3QNCuW+ RyJydOKwK+SEMoDXUYmFQZfMbSkS7bXRlEEK1q58o/9zb7NUJLLiKtWRNqBe2Aeo9PCoz6 bGxUKGHmKk8w4vxKWNOo874nFBaaft4RK2mwHWjkHk2eBBgq5jynkyR8L7e63Kb6BmsToD P3wY17XTZ3kzXAPo61HQQdd032mamDTqAvP4tykOXbc28A5W2KSaaO2F8mIXmlQBeeOLq0 HXoURxVRmGQ69AJrNNmtY/tn0kMUAVmlTfAtaMCVy9evnhJ8OxVo2RtU16sOeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKKGr0zhNzmWk; Tue, 23 Jan 2024 21:00: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 40NL04Zq004108; Tue, 23 Jan 2024 21:00:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NL04BL004104; Tue, 23 Jan 2024 21:00:04 GMT (envelope-from git) Date: Tue, 23 Jan 2024 21:00:04 GMT Message-Id: <202401232100.40NL04BL004104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c809435b18a9 - main - tcp: clear outdated comment mentioning T/TCP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c809435b18a97b7166f1486848a635caaacf892d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c809435b18a97b7166f1486848a635caaacf892d commit c809435b18a97b7166f1486848a635caaacf892d Author: Gleb Smirnoff AuthorDate: 2024-01-23 20:54:43 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-23 20:59:21 +0000 tcp: clear outdated comment mentioning T/TCP --- sys/netinet/tcp_output.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 1ff6f5bee39a..43ea6d4b453c 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -651,8 +651,7 @@ after_sack_rexmit: * Don't send an independent window update if a delayed * ACK is pending (it will get piggy-backed on it) or the * remote side already has done a half-close and won't send - * more data. Skip this if the connection is in T/TCP - * half-open state. + * more data. */ if (recwin > 0 && !(tp->t_flags & TF_NEEDSYN) && !(tp->t_flags & TF_DELACK) && From nobody Tue Jan 23 21:17:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKKfb32Cqz589FW; Tue, 23 Jan 2024 21:17: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 4TKKfb2Vw8z4jDs; Tue, 23 Jan 2024 21:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706044631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GRSvcBcB4JQ+7B5whgomumyiCmSBZbuFmtic13Fgo/o=; b=SmylYIBrWIJ8m105xamJoFoo2loZnEL4Dw/gr14wQSJBd6tBPHMsJ3/KAXaytxujEoGem8 T7/JVxPfVYun4ST/moqqsi+samQtCPrd4t0YSpTFz3jU9y9uIXyVRe1Ifl9lvfL/sco1c+ LtrsCTAhoAu3d+MN7LL3dy1oODa8wWwJsgPwIZYHgLfvFGBSYNs3d6XDMIw9f/GaYtDL1g 6HLvnlr3pjCKZ5YOrfQ+AC7/hWbvdRuAeh1vFZ1xkJ4tvcT94fV54Wu9vZK0t+2QLgNuoD oBT16mEMb7M+m8W+o7GYW0vTy6C6TrlzVj50y3FYdTB/OqFK2Xdf2RBvZI9sHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706044631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GRSvcBcB4JQ+7B5whgomumyiCmSBZbuFmtic13Fgo/o=; b=oP5692cqfOwoTQhPtk2L/yhlUWGSm5V15YTLIbGJ1jcfxj2rtUJlUsWG+AL9dHyh2/3slc OfHvw1li+mYguMsIt93R5gYAvqURVq0bczhIA0VPEuxwy9HR7eZq3B28U+Uu1Xh0VhM29p Xq0PrJRJa11UDaIQ84cDDGc6cL7pjrq7MkZjcevYtx/mDefqLozwmralw3VSra8gCzhoI1 7YFl7/jzrqqpnc3iiKJDY9LGUBzw+v75ncFpzvIjfbydlAr1EhlCQNGKf38Ole6YSDGUNz DWUKlg3CGTVwwqPeJZFonU9dpRzp48+6d4syfUuv/dFfJ5yH6Jy/AJC/AzeSig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706044631; a=rsa-sha256; cv=none; b=GPBpTqLAH83eEgM6uQO5jw2F+OcrfdUBjgJAc/MTSQuvg3kEYE0fJSt0bWy1KRxULKoV6+ eLTrwI64BgnJZ9mgRix0Zw5vrlt9Qet+aVy8orVi8lz3C8rCcXJ82ywwbMvQgEfKBdLSkE MPJZ7y/RMunslmcqJ87zmA/LvOhXSBb+5JatN8ZkiDJQ7HgnanxFvgP5PGUTbTH9B0fTig 666FysszTFCHiioo/ni+0PD9KG5Np+zRFuqko7B/vGnDaOZVU201bu+NhtgvH9L7/3XsZK 1VvXAnCoWMGcN+e9+ZUlRALds4Imqtgqk46sDUx6NILzQHjex7zJyeDBubKYJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKKfb1Z2vzmqy; Tue, 23 Jan 2024 21:17: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 40NLHBlK033902; Tue, 23 Jan 2024 21:17:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NLHBM3033899; Tue, 23 Jan 2024 21:17:11 GMT (envelope-from git) Date: Tue, 23 Jan 2024 21:17:11 GMT Message-Id: <202401232117.40NLHBM3033899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 90ad2dc28747 - main - tcp: remove 20+ year old disabled code from d912c694ee00 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90ad2dc28747a3a5036d68ccc87d2352459f5cb1 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=90ad2dc28747a3a5036d68ccc87d2352459f5cb1 commit 90ad2dc28747a3a5036d68ccc87d2352459f5cb1 Author: Gleb Smirnoff AuthorDate: 2024-01-23 21:16:34 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-23 21:16:34 +0000 tcp: remove 20+ year old disabled code from d912c694ee00 --- sys/netinet/tcp_output.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 43ea6d4b453c..71a50d54d5ee 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1719,16 +1719,6 @@ timer: tp->t_flags &= ~(TF_ACKNOW | TF_DELACK); if (tcp_timer_active(tp, TT_DELACK)) tcp_timer_activate(tp, TT_DELACK, 0); -#if 0 - /* - * This completely breaks TCP if newreno is turned on. What happens - * is that if delayed-acks are turned on on the receiver, this code - * on the transmitter effectively destroys the TCP window, forcing - * it to four packets (1.5Kx4 = 6K window). - */ - if (sendalot && --maxburst) - goto again; -#endif if (sendalot) goto again; return (0); From nobody Wed Jan 24 05:01:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKWxp1gy5z57S6Z; Wed, 24 Jan 2024 05:01: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 4TKWxp1BMDz4YD2; Wed, 24 Jan 2024 05:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706072462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hE2/9ppCWqVhaQJLTs6snL19Ku+/Kr2MOSOZPtAk/Ps=; b=R7egcurSZvpRPjWP5xQaKV1TqDFUF+Qk0JRzn6AUN/PmXgJ5XpmzcvuXyZ36sCfnm68N6i ELXU24KR5jLBKSI4/A+5YI6zQoq1QfqzfD7qfIvE2BiE0TKaBQFOg4iFki5g1tDl18ujL6 CvE+r70K0e+j0O64TxSMEBqGwFXECZtio2IoQcm8g1eX3GI1gqcjAy3nCSjdQlYjtQTsyT SQJjWZPASN0l/0iTVFi2+6PKaTOV0JvlwwAoI0HcU9omLFkbtXqWuPvB2yw9GMFesnIgac K2RxOayMbJv9tTP7l9+6cwDbcTAdlCZ2CFGzgyLgRNioAVTGtaisOmkLLKYP1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706072462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hE2/9ppCWqVhaQJLTs6snL19Ku+/Kr2MOSOZPtAk/Ps=; b=w2BQ6SNVYT7KX5aTXl+h8SWlZOIIE9093LtJsAOvAsdBVeW7ZuT/kWPUfu8s9ArjcHD1NQ ghsJzyQrYE+ZMsWWairwu/5wciATF75CvbciJ9gCCbut1D2ZYIgWPazE2BZoVu5JaYrw37 x8jO+ec6o1yQWxe5eNXeEfMIH/g7LB81r6VYUAPsCJ3sXNKY3xcYfkn5KuwL808fLQ5l4d khD8FmehFqth6w/qDKfM9lfPO18EyftEcpnQM6/8RtNLVBo+Fj2tJIXGvE3aDdtaX6bEYy 5s//ooBSPhbO+DPoC1edg+CiMPMOsS1q2aVd2r5JLzW4bfzDKkmNFvUNbdxIjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706072462; a=rsa-sha256; cv=none; b=gcsf43gisg78m3Cn5QKTjBCWda9s8qIMyQlGP/ylZcdgqu5lL+47SQ0me5RNWe531JQucF LdKDobTeKZfxlKX9/0/oL2OFsJ9DLfC5dVkvPl74EKrGQMmhPiy+h2w6216R4nN5KJphot 6hYrrpli4C5ka99doOjGUQaM2OMqWIwwdq5+08nfUmj3GgyV2Iq9ACl3/cruPb3SSQVMoQ sZdjzG5epxdqFYT/x66pFJezvtcQvcRPOF0wtCErGpmfHOqjQOsSQVl1c+gu9uv1pi4zo4 SBnEa4m21nPrV3+eyYyreXF4XhLhEfDeMiQScCC4vDqhf86MzplxITJMKADghw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKWxp0FTsz115G; Wed, 24 Jan 2024 05:01: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 40O511SP018800; Wed, 24 Jan 2024 05:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O511ik018797; Wed, 24 Jan 2024 05:01:01 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:01:01 GMT Message-Id: <202401240501.40O511ik018797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 009db0d40c6a - main - ncurses: serialize the tinfo build a little bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 009db0d40c6acffe0b9d835cb15a75cc3361173b Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=009db0d40c6acffe0b9d835cb15a75cc3361173b commit 009db0d40c6acffe0b9d835cb15a75cc3361173b Author: Kyle Evans AuthorDate: 2024-01-24 05:00:36 +0000 Commit: Kyle Evans CommitDate: 2024-01-24 05:00:36 +0000 ncurses: serialize the tinfo build a little bit Move ncurses_dll.h to GENHDRS to start with; it's been generated from ncurses_dll.h.in for years, so it's not actually in a different category than all of the other GENHDRS. Slap an .ORDER on it to ensure that we build ncurses_dll.h and curses.h before any *.c gets compiled. This should sufficiently address a build race seen downstream where ncurses_dll.h is present but not yet populated. Reviewed by: bapt Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D43540 --- lib/ncurses/tinfo/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index c1ea75d3aacd..a0b191f50785 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -74,6 +74,7 @@ GENHDRS= \ hashsize.h \ init_keytry.h \ ncurses_def.h \ + ncurses_dll.h \ nomacros.h \ parametrized.h \ term.h \ @@ -170,9 +171,8 @@ CWARNFLAGS.comp_parse.c= ${NO_WUNUSED_BUT_SET_VARIABLE} CWARNFLAGS.read_entry.c= ${NO_WUNUSED_BUT_SET_VARIABLE} # Installed -HEADERS= curses.h term.h termcap.h unctrl.h -SRCHDRS= ncurses_dll.h -CLEANFILES+= ncurses_dll.h +HEADERS= curses.h ncurses_dll.h term.h termcap.h unctrl.h +SRCHDRS= INCS= ${HEADERS} ${SRCHDRS} INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h @@ -214,6 +214,14 @@ FILESGROUPS= DOCS # Generated source .ORDER: names.c codes.c +# Serialize the build just a little bit; there's nothing stopping the build from +# proceeding before ncurses_dll.h and curses.h are actually generated on a clean +# build since we have no dependency information to prevent it. +.ORDER: ncurses_dll.h curses.h +.for f in ${SRCS:M*.c} +.ORDER: curses.h ${f} +.endfor + names.c: MKnames.awk ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKnames.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > names.c From nobody Wed Jan 24 05:12:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBj5y1kz57Ssn; Wed, 24 Jan 2024 05:12: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 4TKXBj539Nz4ZSC; Wed, 24 Jan 2024 05:12:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qb/yvHtRCsQqRFWQie43VoTLYiE4CZIlbFx0ttgzWVs=; b=u0a8fFRK5zAhKQz+4TFQ7wBTsDltnU0uceQa485w0Wr9RXEjmJwQjmYoIJ76kF4rM7XT+h +X9cHwP0ptA3y/aRG4Fw4O0w23on2mkM8RAIDgXoSDUYOMVjKy9pTuBk8kNd3hEqcBXlR8 iNrdF64eOAJtts6Sh20e1xWAN/BQOeYWa9oqtb5QsTw1zQzX8pOdacVleN7olpOdgHc50K wzQCSjhR3+BrwL03sArr3tBSXl6fzeMGAj4E6T6ETQeBbrR7s6kIFYhhKwXyZgX8SRP/Pt sUeuALqguDXH0AaOOQhp99FvhdrV/jtg0a8n8UIDZdw81qPdrvin9Q7pGsMLhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qb/yvHtRCsQqRFWQie43VoTLYiE4CZIlbFx0ttgzWVs=; b=fD4xx6BeuzhqPLQO4sYsJEFskwV6YbwuT+Y/LF+Wk1cvuQeB+V9Dy0LF8bP2DWgumR4n3q rbJXCZGPYb4ykibNiyBJEy1dF7FBomY2gZrbVV9ja8Pck8EgkSyVJGAozu3s8OY2NxybVi YUg2p80iHEwn9Ecr0infsvexy/3iLWrC0ja1qIKgQu/EvBrSGO0cmousiOUJi2aIt0dIUj wdyLeKxqFVEaYNk1vUYpY6dUBzHKPLLhiMqpO8DKcOIOXaRmZAnjiTQ9Zfb9EzHfOZLFNp u7igE66yN4tzEAMQ8v1I208x8x7pBbX9tW57LrQkAwIIodmi6oMvukbhtqbQdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073133; a=rsa-sha256; cv=none; b=cCegJeXUShVoUcoS9MUGgH6gYw23oKhe01o8jIjM3ZLMcvRueu7TAb/2C3Z3sMbQ4m1HO/ qnJOg6n0YxdDWYEA/oFUNBA4scRVp7b2404uITKSlLqbc7HyuoJ/mJOs9Cr8ztWOjnp1V6 LCxmagOIGcSftnsefsGUmiwhFQYoorPGnbu+j5bVimIRlz7vMZ9knxM4D6eACIw2B26Sy6 fky+OkYSrtvCNEtg6xH7lfP9PbYcYUk2bS5amlEOvRVdscISiPSCGsB79rDrIc8rMMGLef sSOnZzULBAEKO0eU65yWcurQBuKVRkY6RDlvRrYq5FBfG/EHT+wTghqYlgwH9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBj46Pmz11Sd; Wed, 24 Jan 2024 05:12: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 40O5CDkD039943; Wed, 24 Jan 2024 05:12:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CDqo039940; Wed, 24 Jan 2024 05:12:13 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:13 GMT Message-Id: <202401240512.40O5CDqo039940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 24fee9771e0b - main - sys/file.h: style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24fee9771e0b1e2f4836b9bb1688cbe8104b403a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=24fee9771e0b1e2f4836b9bb1688cbe8104b403a commit 24fee9771e0b1e2f4836b9bb1688cbe8104b403a Author: Konstantin Belousov AuthorDate: 2024-01-20 21:49:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:25 +0000 sys/file.h: style Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- sys/sys/file.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/file.h b/sys/sys/file.h index cfa0fc75443f..0bdf7e9baa7b 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -479,8 +479,9 @@ fo_fallocate(struct file *fp, off_t offset, off_t len, struct thread *td) return ((*fp->f_ops->fo_fallocate)(fp, offset, len, td)); } -static __inline int fo_fspacectl(struct file *fp, int cmd, off_t *offset, - off_t *length, int flags, struct ucred *active_cred, struct thread *td) +static __inline int +fo_fspacectl(struct file *fp, int cmd, off_t *offset, off_t *length, + int flags, struct ucred *active_cred, struct thread *td) { if (fp->f_ops->fo_fspacectl == NULL) @@ -489,7 +490,6 @@ static __inline int fo_fspacectl(struct file *fp, int cmd, off_t *offset, active_cred, td)); } - #endif /* _KERNEL */ #endif /* !SYS_FILE_H */ From nobody Wed Jan 24 05:12:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBk6cKsz57Sm9; Wed, 24 Jan 2024 05:12: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 4TKXBk61Bpz4ZHt; Wed, 24 Jan 2024 05:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D0qppDWaKW06TDqESf1BU5xo5kbEndJbe6WU7ltSCas=; b=N3inqXMZ48ndCkLLFT3nbKcXVxus00uL4fApFy04uKD9qer1TyctOTQRQRjJ4hubQg/Zah YltsysmQCWwFfaDTq2yk+KG/FAdgqynsYmG5y3+DGy89HUX2mEPeJa4JkqZ60OVP8npN2X 3eYwXi6Sr8z4h/FMO/G8MVK1YWI+lZxuyWOmwzFDTcPxSztnQdhAEQqzQgV7HZ49OHQmCB 8ZVu0m5xZ2W8xGoWrrgxmbqdKIuuQAD+c35vILJkTuk8TP+KVwPnKgRuLBe+CsAfGcoiV3 flNDJCzgjedBoHDg673nEwYEq+o3vXsAQ4FCtUclL+KAw9vD13+iAN9g3RxHFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D0qppDWaKW06TDqESf1BU5xo5kbEndJbe6WU7ltSCas=; b=fmum5z6BO+UHwkNmaOQtVVDG0qjlV2cqmclYGoQ1oVABxd6N4cOTSwJ6ZrwBcWBclvNb/Q uWlhtiVoDrvOI7Yk5wJCpXn7YtPjV65T9CH184Y5pKSvJFkijGj6ce4WvvTpAc1+QqLTO5 vdj/vpZZ0OiZVddz+2MZK9DzaLykEQkCifojeuqlP/948AI12q/sbTewJBwuCqC03qwE8t I5PIDP4WprnuHAB0vXPMhXqKvhbhAfUoiNJ1IJ+Vq5YgUATa+MKhM0A2+yEcbzH/1I9Sfd etBIzn11FzHQ4uvzgM6htjSNmm4GJwfnJ7k8rXufqr4nwIYDPaXstk5p3AwLvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073134; a=rsa-sha256; cv=none; b=LfuHKWPz/SMiItdV7RrnLWNEpNZ3MJg+ZYxEHKrHcJHg0/370j3FcEgdugON0vWsBsHUHm Ix8demD81TpUnYx5/ziMY/UPCYoRNYHW8nZUXeXCub1S/DQxSjHfPnTVlWFjiMoEeOXxr3 TqggtJ3u5JwkSQjjagX53DTZt+UwmusSkq4DXzzfked82jYlsDyrFvc5jZVYR52nmj9pgD CwuCfMnwILIlzKpdh7w/xnNeBnkevtwMTFmKOhTRlX115VwTiSXXq1a83mxorsM7/Cd8Hp vKC3LQq4J2X/yw9lAIyEfAAXaygLdH4p28loFv1DYGnwWZ6E6gML0bcfsytP7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBk54Znz11Sf; Wed, 24 Jan 2024 05:12: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 40O5CEJS039976; Wed, 24 Jan 2024 05:12:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CEo1039973; Wed, 24 Jan 2024 05:12:14 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:14 GMT Message-Id: <202401240512.40O5CEo1039973@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 58d317169834 - main - Add fget_remote() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58d3171698341c664d7c676541b86385a924ae93 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=58d3171698341c664d7c676541b86385a924ae93 commit 58d3171698341c664d7c676541b86385a924ae93 Author: Konstantin Belousov AuthorDate: 2024-01-22 22:31:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:26 +0000 Add fget_remote() The function holds and returns struct file for a file descriptor index in the given process. Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- sys/kern/kern_descrip.c | 32 ++++++++++++++++++++++++++++++++ sys/sys/file.h | 1 + 2 files changed, 33 insertions(+) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index a0130842aacb..e8e08f57196b 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2960,6 +2960,38 @@ fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, } #endif +int +fget_remote(struct thread *td, struct proc *p, int fd, struct file **fpp) +{ + struct filedesc *fdp; + struct file *fp; + int error; + + if (p == td->td_proc) /* curproc */ + return (fget_unlocked(td, fd, &cap_no_rights, fpp)); + + PROC_LOCK(p); + fdp = fdhold(p); + PROC_UNLOCK(p); + if (fdp == NULL) + return (ENOENT); + FILEDESC_SLOCK(fdp); + if (refcount_load(&fdp->fd_refcnt) != 0) { + fp = fget_noref(fdp, fd); + if (fp != NULL && fhold(fp)) { + *fpp = fp; + error = 0; + } else { + error = EBADF; + } + } else { + error = ENOENT; + } + FILEDESC_SUNLOCK(fdp); + fddrop(fdp); + return (error); +} + #ifdef CAPABILITIES int fgetvp_lookup_smr(struct nameidata *ndp, struct vnode **vpp, bool *fsearch) diff --git a/sys/sys/file.h b/sys/sys/file.h index 0bdf7e9baa7b..83da5105ad2b 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -261,6 +261,7 @@ int fget_write(struct thread *td, int fd, cap_rights_t *rightsp, int fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, int needfcntl, struct file **fpp); int _fdrop(struct file *fp, struct thread *td); +int fget_remote(struct thread *td, struct proc *p, int fd, struct file **fpp); fo_rdwr_t invfo_rdwr; fo_truncate_t invfo_truncate; From nobody Wed Jan 24 05:12:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBm2qWnz57SmD; Wed, 24 Jan 2024 05:12: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 4TKXBl6hDGz4ZSQ; Wed, 24 Jan 2024 05:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ojjYCzob5kLBdjICvdygbI8/B/6P6C7H1pkykAPR8sM=; b=r0Qems2cAFbuBZ8pKkzhM7ZRRtPto2q4SzqycnsGsSWFN2bjqcyMXe9t74TDd5JLeb/WFp LZzo4h8VhHIbPLwR2r57rqOPOT9yWDidHdYl64brD8Nigk+lxHuctFXG6ROVk1rWqOFfvV UIUDjPTeRHMIqTgcf11qMjtJFU2O9qpNPJ1TGU5nACQ+1BN3lr0Jg/lo3d+D8EMXIt5Hc3 GWH61DZM8zwOyNEcuBdkQRkrn1gUJL5b3d9HuEX2KVEaWg3uxaR82agBBImKwh1MGKXdIT pkmhHh1uvuUAFHzv4R1IlsMq4K0mdRBEC3omBIS70tGYPT/Ps77bx9VvesptnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ojjYCzob5kLBdjICvdygbI8/B/6P6C7H1pkykAPR8sM=; b=e6wLXvR3fFcq4g+qxqeXNel7USmZcFw0jacvobfYOVwP33n1UAla3EprHodkj04/iMj9U0 X1W5FIgU7JR+QOJ83lwraiN05lSHWduWcUzcMoq7Kh1H7tDyvhrt/mo7ZqB3pBXu50mZc/ WQFNDeTz0lQQpau1EeKZj/MC14qlFfg3yNZU3NQ65k6sRLUZafcehilEDVqdnWb3CeyFUF mEmNSkzJIfaldh4Th7ErR3QxXQLd/ztdhm3nttHQi/6K31F3aE0i0kjVweVAXhj/alJeTw iJbyvEfn/KrMKlhQvDOTDPOXw1mgI/mx13OUZoW0G0DeNnKVcu5o5xRuq3TatA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073136; a=rsa-sha256; cv=none; b=mekV1se67NtIfY+EADLRy43nuBZSc3QeorzzVfoIMcXWhzM5c0+e0GzPfAe2dcxyUfs9cz GgJlbf/Z9rXPeSLTj3i8cE1gMBKdiUibFX/3WlU2UBd3z3qxkur2Ba89/lUMBmj2KEQHpT xfuWggqGgoI7K1NRfknZXgKxpB+v0mby1U85ZsAVr6m9nDNZoWOlNkx8ncR68VeRZPov+x dnx05cpydLxoUsRpspzTqLL2vjIOHLeWDXDmIR2wtycZXeyxf3g5Z82GwnhJjWHv4OShM7 jsgce47iihiD5aXHUUjU5jlOwul2Gpy1SU6mOl6UD44U5Y0gYtRfM4kgII3WBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBl5npyz11fx; Wed, 24 Jan 2024 05:12:15 +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 40O5CFhp040020; Wed, 24 Jan 2024 05:12:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CFMY040017; Wed, 24 Jan 2024 05:12:15 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:15 GMT Message-Id: <202401240512.40O5CFMY040017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 168c7580c632 - main - file: add fo_cmp method List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 168c7580c6328342945db0e19a0791466bb07624 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=168c7580c6328342945db0e19a0791466bb07624 commit 168c7580c6328342945db0e19a0791466bb07624 Author: Konstantin Belousov AuthorDate: 2024-01-19 21:01:35 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:26 +0000 file: add fo_cmp method The method should return 0 if the file' underlying objects are same. In other words, if 0 is returned, io from either of file causes modifications of the same object. Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- sys/sys/file.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/sys/file.h b/sys/sys/file.h index 83da5105ad2b..80ed0e2db3bf 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -129,6 +129,7 @@ typedef int fo_fallocate_t(struct file *fp, off_t offset, off_t len, typedef int fo_fspacectl_t(struct file *fp, int cmd, off_t *offset, off_t *length, int flags, struct ucred *active_cred, struct thread *td); +typedef int fo_cmp_t(struct file *fp, struct file *fp1, struct thread *td); typedef int fo_spare_t(struct file *fp); typedef int fo_flags_t; @@ -152,6 +153,7 @@ struct fileops { fo_get_seals_t *fo_get_seals; fo_fallocate_t *fo_fallocate; fo_fspacectl_t *fo_fspacectl; + fo_cmp_t *fo_cmp; fo_spare_t *fo_spares[8]; /* Spare slots */ fo_flags_t fo_flags; /* DFLAG_* below */ }; @@ -491,6 +493,15 @@ fo_fspacectl(struct file *fp, int cmd, off_t *offset, off_t *length, active_cred, td)); } +static __inline int +fo_cmp(struct file *fp1, struct file *fp2, struct thread *td) +{ + + if (fp1->f_ops->fo_cmp == NULL) + return (ENODEV); + return ((*fp1->f_ops->fo_cmp)(fp1, fp2, td)); +} + #endif /* _KERNEL */ #endif /* !SYS_FILE_H */ From nobody Wed Jan 24 05:12:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBn3Mw4z57THQ; Wed, 24 Jan 2024 05:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKXBn0rF4z4ZJR; Wed, 24 Jan 2024 05:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zdberss6sO5CxHkk8tyO4PKvPbly0Nqdhz5PEyb2SHA=; b=jSBuikbgcG59BM2C2CbYmEhzUuywBcrrvCJQCp3If+KCa7pDLx/gNY/GI8NvWQEsJPrQZ7 w/GDJDREknpZ2Y/GqKd5XyynjwtWAEDp8rnQhJivUkPhHNvzj7F1IkwMvqeqP4tx+rDyEJ I/x9br490tny6S6C62GyYsw0FpIWKaITZnxfn67dG1WiL2kN5jCCb/hnGv69ic/6pxz+aE xNgP1SMHRjLYxpCAtV/1iSJXVhraaDKJjkgF+FYreXV2JEZONXmg7RTs3Bdc6v1/j7Zm6H xaAwLJKYsHdy5WIQBGTepNsKCIDWIr9KMIQ43FU6IoXWeDfh9F2voYAEmQ4EQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zdberss6sO5CxHkk8tyO4PKvPbly0Nqdhz5PEyb2SHA=; b=cXXLseui6pqYFzOxs4qUhUy1wBXjY+9JACZWSqzuEo3VGXpqztiYOasOi+xlVtB5CTvQHm yM2cSkqfsa1pUUFoub2HMV3lVXYY+7LHqVVQS0XVo3V3Ut+UQ3VQrj1QuYgT/GtS8+q3qp xLH/xHNHmKAGhXYWz+RO0s+cX4882YKjF6UuvfhYriw7Rlmj+KSKDoO4vUdTGCZ/ylFf3e KcK0oXZhBasrxDIuQSFLYg+f5m4+Ivf3AlshZhISzqh2T1DSHhIGISWvyegeK1nrHPZJCS t5EHxjzzPkgW5tH4cSeK3MKyfaq7XGmAfAeclV4UL1k2FxcgC5ABoA5SC8Boug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073137; a=rsa-sha256; cv=none; b=vaKgiNH4rI/EsutR1T9PLAaCDlpsndfvBsKdTan1p7l4v2erP+O+Ynpav5d1K5+qhEmUCe fHiRblkdnabooB6V61RUlgqxcVkt59njFkCB51yhx84Od6CYM20ySlKYMk75Rmh526WfxM LUXADRN6oTzEExliCxNeVJYIbCiTDMCvfxwwzxfDqvYxKTLtDmxJ2VIOWCvCJM8KzDDWjd EWJbd6Hmj4etuAZxSOkdsWp2VGXE4vW0HlVD0XTYgyAF+7CuBLYHSM1FTwRbprK7HRJhfq ykH3DC7WdrPsa6njlP5RVsQ54SlFD95+CkBpk40hQmK2+GInqvy9YfLwj/fOFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBm73fDz11lF; Wed, 24 Jan 2024 05:12: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 40O5CG2j040064; Wed, 24 Jan 2024 05:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CGGe040061; Wed, 24 Jan 2024 05:12:16 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:16 GMT Message-Id: <202401240512.40O5CGGe040061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d8decc9ae31a - main - Add kcmp(2) kernel bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8decc9ae31af7ffc77276c89639fb13eb1020cc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d8decc9ae31af7ffc77276c89639fb13eb1020cc commit d8decc9ae31af7ffc77276c89639fb13eb1020cc Author: Konstantin Belousov AuthorDate: 2024-01-19 19:49:36 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:26 +0000 Add kcmp(2) kernel bits This is based purely on reading the Linux kcmp(2) man page. In addition to the Linux set of comparators, I also added KCMP_FILEOBJ to compare underlying file' objects. Tested by: manu Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- sys/kern/sys_generic.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/kern/syscalls.master | 10 +++++- sys/sys/syscallsubr.h | 2 ++ sys/sys/systm.h | 2 ++ sys/sys/unistd.h | 7 ++++ 5 files changed, 107 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 8687bb447251..7698f5d60063 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -65,6 +65,7 @@ #include #include #include +#include #include #include #include @@ -2071,3 +2072,89 @@ kern_posix_error(struct thread *td, int error) td->td_retval[0] = error; return (0); } + +int +kcmp_cmp(uintptr_t a, uintptr_t b) +{ + if (a == b) + return (0); + else if (a < b) + return (1); + return (2); +} + +static int +kcmp_pget(struct thread *td, pid_t pid, struct proc **pp) +{ + if (pid == td->td_proc->p_pid) { + *pp = td->td_proc; + return (0); + } + return (pget(pid, PGET_CANDEBUG | PGET_NOTWEXIT | PGET_HOLD, pp)); +} + +int +kern_kcmp(struct thread *td, pid_t pid1, pid_t pid2, int type, + uintptr_t idx1, uintptr_t idx2) +{ + struct proc *p1, *p2; + struct file *fp1, *fp2; + int error, res; + + res = -1; + p1 = p2 = NULL; + error = kcmp_pget(td, pid1, &p1); + if (error == 0) + error = kcmp_pget(td, pid2, &p2); + if (error != 0) + goto out; + + switch (type) { + case KCMP_FILE: + case KCMP_FILEOBJ: + error = fget_remote(td, p1, idx1, &fp1); + if (error == 0) { + error = fget_remote(td, p2, idx2, &fp2); + if (error == 0) { + if (type == KCMP_FILEOBJ) + res = fo_cmp(fp1, fp2, td); + else + res = kcmp_cmp((uintptr_t)fp1, + (uintptr_t)fp2); + fdrop(fp2, td); + } + fdrop(fp1, td); + } + break; + case KCMP_FILES: + res = kcmp_cmp((uintptr_t)p1->p_fd, (uintptr_t)p2->p_fd); + break; + case KCMP_SIGHAND: + res = kcmp_cmp((uintptr_t)p1->p_sigacts, + (uintptr_t)p2->p_sigacts); + break; + case KCMP_VM: + res = kcmp_cmp((uintptr_t)p1->p_vmspace, + (uintptr_t)p2->p_vmspace); + break; + default: + error = EINVAL; + break; + } + +out: + if (p1 != NULL && p1 != td->td_proc) + PRELE(p1); + if (p2 != NULL && p2 != td->td_proc) + PRELE(p2); + + td->td_retval[0] = res; + return (error); +} + +int +sys_kcmp(struct thread *td, struct kcmp_args *uap) +{ + return (kern_kcmp(td, uap->pid1, uap->pid2, uap->type, + uap->idx1, uap->idx2)); +} diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 709b01f0abbe..2f1bea33ac8f 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3329,6 +3329,14 @@ _Out_opt_ _Contains_long_timet_ struct itimerspec *old_value ); } - +588 AUE_NULL STD { + int kcmp( + pid_t pid1, + pid_t pid2, + int type, + uintptr_t idx1, + uintptr_t idx2 + ); + } ; vim: syntax=off diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 1eca098365e7..2c3059b27c82 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -198,6 +198,8 @@ int kern_ioctl(struct thread *td, int fd, u_long com, caddr_t data); int kern_jail(struct thread *td, struct jail *j); int kern_jail_get(struct thread *td, struct uio *options, int flags); int kern_jail_set(struct thread *td, struct uio *options, int flags); +int kern_kcmp(struct thread *td, pid_t pid1, pid_t pid2, int type, + uintptr_t idx1, uintptr_t idx2); int kern_kevent(struct thread *td, int fd, int nchanges, int nevents, struct kevent_copyops *k_ops, const struct timespec *timeout); int kern_kevent_anonymous(struct thread *td, int nevents, diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 508690cd639e..c684f3365c35 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -485,6 +485,8 @@ int poll_no_poll(int events); /* XXX: Should be void nanodelay(u_int nsec); */ void DELAY(int usec); +int kcmp_cmp(uintptr_t a, uintptr_t b); + /* Root mount holdback API */ struct root_hold_token { int flags; diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index 87f79fc8d554..6128aab61877 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -195,6 +195,13 @@ RFPROCDESC | RFSPAWN | RFPPWAIT) #define RFKERNELONLY (RFSTOPPED | RFHIGHPID | RFPROCDESC) +/* kcmp() options. */ +#define KCMP_FILE 100 +#define KCMP_FILEOBJ 101 +#define KCMP_FILES 102 +#define KCMP_SIGHAND 103 +#define KCMP_VM 104 + #define SWAPOFF_FORCE 0x00000001 /* From nobody Wed Jan 24 05:12:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBp3Bsfz57T0q; Wed, 24 Jan 2024 05:12: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 4TKXBp1Db7z4ZWx; Wed, 24 Jan 2024 05:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gs5ffH5XXs3rTs0jk1zpUXsgYCH5kYB1ieI5Xq1iMhk=; b=JmZARLO0Z2ckMtyNykA2JpVL966KrcQbMQwglrBU3KS1APl+N+o33+ZdE4g2MLZSMVJM/n W7dlv2ah44MCa0T5sD04aZxfVs5zk8Jy87mVMJOHMmtRKqBhtxc7ibBhpF5IxxeQoIz7rW +wM7gM7xdGBaD5FVQShQWbFKqDUuVnBsS42dCPLkVGy+UJI38YO3kMq3j8cVyDWvIxqhjc N13CdGZUbLN9TOe09DJGnAVAXaqYBSXh69FeB7IHg/40mbzJhaRcHq9KNmPuO7vseedaU7 c4Xm65wDji+dQNgr96VZusyw6Wq/JJgtsNtTWKw/NysJG2MQQArXxRPuo6eLqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gs5ffH5XXs3rTs0jk1zpUXsgYCH5kYB1ieI5Xq1iMhk=; b=jrfS0iRA+gcYGQ072YZjstQhqMp81cqJt9oqPy4egqClmRiJxAaW95gMT/XPXgHUWlzn+o QohjX9cLDIJJdZ7fm9XcKeswLePu2bYJWWxfIVSZG2re9XhkhOElyb4A9JLtYBEqNo7Fjp vOSlr4qRWyAVSzjyeJ3p5xRW6nipuBkE0BGZouWOZrh071LSKSpcqYKQVM1G3otahoqz4R CI5CD70dDQoaFW0zoVt08R7h2JADZBxAV1vz4WwHUmd2PllKJXNfKFlWi8JIhorVPkebKm BFdg5sbX3zQQdKj5WIUgUAWPulrUhdZQlM8D9IrZbtrA7D9+uo5V8G/dZFjmbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073138; a=rsa-sha256; cv=none; b=HVyQlVhzJkDLna9doFmcZfXX2tPldi4vgOex/0b9BuvBXMJlH3XsNj/JO4lRmEayvBMe2f aW0dXff0jrm13f8tf8w3nZbed6bCW128gQSQJBylHQRJ5R7NX1GsDZgE3MZ6oBS2R/4aQn XkKqX8aa/KqCIuDg0ynaWstWXHUHw68q4yAARx3pTEb6qlayi+3iirfPsfGZN5j2yNx+i8 rvO5WCQPi4Fd8Ib4a0FfSSvAMlIZxjpB7ChO/Pvf/7CsS44cChjYr9pf3mBQLQfjIomLtW nRCrun5XEL1/IdJga/B98H7a0IlAyP3q5oRdr1X8WUOvbmXDTt0x6rr8LHp5QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBp0Lkxz1176; Wed, 24 Jan 2024 05:12:18 +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 40O5CHQE040103; Wed, 24 Jan 2024 05:12:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CHFQ040100; Wed, 24 Jan 2024 05:12:17 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:17 GMT Message-Id: <202401240512.40O5CHFQ040100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 211bdd601ee5 - main - Add kcmp(2) userspace bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 211bdd601ee51f90da9b123807ef68ac122116b9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=211bdd601ee51f90da9b123807ef68ac122116b9 commit 211bdd601ee51f90da9b123807ef68ac122116b9 Author: Konstantin Belousov AuthorDate: 2024-01-19 19:55:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:26 +0000 Add kcmp(2) userspace bits Unlike Linux, we do provide libc wrapper. All definitions and prototypes are available from Tested by: manu Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- include/unistd.h | 1 + lib/libc/sys/Symbol.map | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/unistd.h b/include/unistd.h index 8a01d563fe99..e4e5c62fbb67 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -519,6 +519,7 @@ int iruserok(unsigned long, int, const char *, const char *); int iruserok_sa(const void *, int, int, const char *, const char *); int issetugid(void); void __FreeBSD_libc_enter_restricted_mode(void); +int kcmp(pid_t pid1, pid_t pid2, int type, uintptr_t idx1, uintptr_t idx2); long lpathconf(const char *, int); #ifndef _MKDTEMP_DECLARED char *mkdtemp(char *); diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index e9e3c7151c2f..a49229ace995 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -424,6 +424,10 @@ FBSD_1.7 { timerfd_settime; }; +FBSD_1.8 { + kcmp; +}; + FBSDprivate_1.0 { /* System call stubs */ ___acl_aclcheck_fd; From nobody Wed Jan 24 05:12:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBq4YpBz57THT; Wed, 24 Jan 2024 05:12: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 4TKXBq2bxYz4ZgP; Wed, 24 Jan 2024 05:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3AH0Zkt4RhE2u/gBRKWEfnLZBnFU2+vLJZjSsvOHMkc=; b=VPp5YFaQBXkC9etk7I4dLiVmcwLivp7ZZE9Jdbrd8PIzCZbzqb1Vk5d7BwdQ1zucb4y7+/ lNiDae1Xkaz92eIUCFPaPtOWNgqmR+TYSSsKpXAt81dP3L9NC/+RXNHds7XI40KjSCzhrw hsaNIjTA2ZHMItVH5aHnnHX5p0Atk1Kt9hqx5A7vjW6fDIdZsDXnjL1kMXMR5NDUHrVIRf UqhwEl+j82UfA+UqQklZTNmcvEvQMB+dDKwhxkU5Uxnsc0SHu01ATGNh6cdpTCpBJ+hui7 q6ikZ8eaOjdRSV6MXQSvNm5dDKGdSF3PKGYrMY+kcl7JoJo5lK4GLdt/gsmKfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3AH0Zkt4RhE2u/gBRKWEfnLZBnFU2+vLJZjSsvOHMkc=; b=arvYQ8MifEBR3U/fXmxTneAqkkrlxLvh/ooTMei9/D4b3/NEyVX/xhixj7v2DrSgPPHS1T rOa07TjUVw4E/c50QpqwU4pH9QJeDN9shjpRWF7jpQBMReyXXMxqEYNXt3wFpyZ6Jdb1qr u3KDO7hNXjy7EacYGJ626LTGv5+bVHfC2WhiBEQ428kS1vKxROKn05kAtAyn4/NU0E/tbu qyh8Z8BCE1NmioWNu0AXfPPsqMhhQgtdzrRF/xd2UhA4l9rdq+atoZcTNh2WsExSqG2qnZ gDmZU2uHjAxPKCOWavW5ilf8waW9lGHKF7p7AKwxhYKaWNohf1ZgQ1OU3Kdw3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073139; a=rsa-sha256; cv=none; b=Uso4yewp7vK+0dFerAjNGFV7+d3qBAFSyYoBAcppHWkVUH6MuWMr+toP8MGm1mNPRWrfbs joe8+ESSA6JzvC4CSyGeIJWzxfUoqO2s7HqldreCgEkKmqeVCW4i+6oheRAzNmcWOlvTAd t0jr9oMNgOBZbJ5pN9uJ6pjE50IROX572+DATKtjqkqwbDZCNtmn0G/gOMG2CBTi98FKNE YGWjrxkwIeZUMP017qoLdcHCXVcxJeKYAnxuC/P/BUylU4iJsRKxN4oB0PzvR5u2y9XIC3 rrDrGyMTZ/rsb+RYWdmZ6/ClqAOFxjoqjyxTdVhY3+sfyROTuLVTeGgVzKY0DA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBq1hlMz11g0; Wed, 24 Jan 2024 05:12: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 40O5CJvJ040148; Wed, 24 Jan 2024 05:12:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CJ0T040145; Wed, 24 Jan 2024 05:12:19 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:19 GMT Message-Id: <202401240512.40O5CJ0T040145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f28526e9466c - main - kcmp(2): implement for generic file types List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f28526e9466cd60ed33053e922238ba1c9040341 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f28526e9466cd60ed33053e922238ba1c9040341 commit f28526e9466cd60ed33053e922238ba1c9040341 Author: Konstantin Belousov AuthorDate: 2024-01-19 21:44:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:26 +0000 kcmp(2): implement for generic file types Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- sys/kern/kern_event.c | 1 + sys/kern/sys_eventfd.c | 1 + sys/kern/sys_generic.c | 8 ++++++++ sys/kern/sys_pipe.c | 1 + sys/kern/sys_socket.c | 1 + sys/kern/sys_timerfd.c | 1 + sys/kern/tty_pts.c | 1 + sys/kern/uipc_mqueue.c | 1 + sys/kern/uipc_sem.c | 1 + sys/kern/uipc_shm.c | 1 + sys/sys/file.h | 1 + 11 files changed, 18 insertions(+) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 540fd58d2e2a..41295c374e65 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -139,6 +139,7 @@ static struct fileops kqueueops = { .fo_chmod = invfo_chmod, .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, + .fo_cmp = file_kcmp_generic, .fo_fill_kinfo = kqueue_fill_kinfo, }; diff --git a/sys/kern/sys_eventfd.c b/sys/kern/sys_eventfd.c index 50c126f06dc6..4b1230b29b16 100644 --- a/sys/kern/sys_eventfd.c +++ b/sys/kern/sys_eventfd.c @@ -76,6 +76,7 @@ static struct fileops eventfdops = { .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = eventfd_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE }; diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 7698f5d60063..e185900b93be 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -2158,3 +2158,11 @@ sys_kcmp(struct thread *td, struct kcmp_args *uap) return (kern_kcmp(td, uap->pid1, uap->pid2, uap->type, uap->idx1, uap->idx2)); } + +int +file_kcmp_generic(struct file *fp1, struct file *fp2, struct thread *td) +{ + if (fp1->f_type != fp2->f_type) + return (3); + return (kcmp_cmp((uintptr_t)fp1->f_data, (uintptr_t)fp2->f_data)); +} diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 3169d922cc68..1d48728139c2 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -165,6 +165,7 @@ struct fileops pipeops = { .fo_chown = pipe_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = pipe_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE }; diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 314576281d6e..7854a4ebdf52 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -109,6 +109,7 @@ struct fileops socketops = { .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = soo_fill_kinfo, .fo_aio_queue = soo_aio_queue, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE }; diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index e245baed88be..d9c0e189baf2 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -371,6 +371,7 @@ static struct fileops timerfdops = { .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = timerfd_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE, }; diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c index 31122d422a28..4a3b3d77c89e 100644 --- a/sys/kern/tty_pts.c +++ b/sys/kern/tty_pts.c @@ -610,6 +610,7 @@ static struct fileops ptsdev_ops = { .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = ptsdev_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE, }; diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index f4660be70da8..f7695945fcc4 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -2661,6 +2661,7 @@ static struct fileops mqueueops = { .fo_chown = mqf_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = mqf_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE, }; diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index d3c77a37400a..b4652e9106ac 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -153,6 +153,7 @@ static struct fileops ksem_ops = { .fo_chown = ksem_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = ksem_fill_kinfo, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE }; diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index f5803d1d72de..13fb0915cdaa 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -169,6 +169,7 @@ struct fileops shm_ops = { .fo_add_seals = shm_add_seals, .fo_fallocate = shm_fallocate, .fo_fspacectl = shm_fspacectl, + .fo_cmp = file_kcmp_generic, .fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE, }; diff --git a/sys/sys/file.h b/sys/sys/file.h index 80ed0e2db3bf..6d1b8b8e1df4 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -279,6 +279,7 @@ fo_seek_t vn_seek; fo_fill_kinfo_t vn_fill_kinfo; fo_kqfilter_t vn_kqfilter_opath; int vn_fill_kinfo_vnode(struct vnode *vp, struct kinfo_file *kif); +int file_kcmp_generic(struct file *fp1, struct file *fp2, struct thread *td); void finit(struct file *, u_int, short, void *, struct fileops *); void finit_vnode(struct file *, u_int, void *, struct fileops *); From nobody Wed Jan 24 05:12:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBr5MyKz57TFF; Wed, 24 Jan 2024 05:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKXBr3f0Wz4ZKB; Wed, 24 Jan 2024 05:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BLpTv+/0CoQ5ikqXX9HaKDaq0D3g3WKF00ECklfOGRc=; b=A/QSoH4d+C7dcCKtaPrAHQX6po4mrWWoMOjgGWv4YLOTyhnDF2GYQJqy65t/rnLXfTEVZv 62xlKjoaZJijhJkj1DrnvETG8yZhctcjmylsmRLXqLKa5R69mVIZp4KQEO9uKScJXYrQRU 6Rt8vzEdQKYJHNwyiPeuiFtJY4vQkKLwzQR0zUb1z7m+IfaseENCOSjAd/QTn+Q7WVJdf4 5snaWQiL41UcfBAhxms7T5feXvSd/C//IFetr4Ej1yMRc68dJTFkOGCZ7ktqLSO9znOLjx hgKMMYwwJ6hbQVbfGP7JmZtjsgRldc01RKx0USQXAZ3wZtefVAS9X2Qsz8vCHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BLpTv+/0CoQ5ikqXX9HaKDaq0D3g3WKF00ECklfOGRc=; b=k9eieFASx62pT+DjEQIIMnCnNk5uSYrqNd5r5HpEz2j2DwOEprOndSj50BPt/93Y9RkVTz ljnph2ZpcemTNUxGN5CAkstvUA245WL4Ttxpm76NT+D+YPTd1p+3PB2Q43PHbPHyFoNw/K ffuHa3za0nJe5ccFFQUtN6pGgyDfOsGpT43BLWJBfdiMIWyZCC8sBYcHT147GP+YmFbatv yCUBBL/ViFzAzizl4mraP/pHYtj1UKdrRXvcOL67c+iLHqZNOIhKT+/hzWtB+AgkcSnU9k 00Ywlms70xxtdvXNw+bLfIdgwBANkunD5U1is8fWcj+Znl+QkLAXulKcliZhnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073140; a=rsa-sha256; cv=none; b=BTUtUVtDKqr+2bnnB/+AP1jnmS9dj9eVH2/7nKG/TQajOV5AI/VkvWbt37IpcwhKXarpTf oaHUCXrzZZq6Wz5FxnJHfupb3SWCGc/YjlO+9VyprK819JbGIEsW+0Z9arZJ2C2aN7LF71 odYaN5JBPc8o6Dl0SDC/MVAg4qFkcGkFZiVubgvrH4VIYS1QTtGNNBToTugoq+wgNpseHv somv9ftMnHHthB6O89NgespGsz8mEcD1q7PKkrqAhBvXbxiEPPAssqAd9ibeQfZfGJSUEG /FcPGbTmR9qQoDjCJrrkSRuirFbun415eopr77wgf6ziKjmLGYq12Gd8FPF3JQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBr2lQCz11wX; Wed, 24 Jan 2024 05:12:20 +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 40O5CKrB040190; Wed, 24 Jan 2024 05:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CKKr040187; Wed, 24 Jan 2024 05:12:20 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:20 GMT Message-Id: <202401240512.40O5CKKr040187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f04220c1b064 - main - kcmp(2): implement for vnode files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f04220c1b0641fa68d01dc85d9fef706b02f4079 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f04220c1b0641fa68d01dc85d9fef706b02f4079 commit f04220c1b0641fa68d01dc85d9fef706b02f4079 Author: Konstantin Belousov AuthorDate: 2024-01-19 21:24:31 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:26 +0000 kcmp(2): implement for vnode files Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- sys/kern/kern_descrip.c | 1 + sys/kern/vfs_vnops.c | 9 +++++++++ sys/sys/vnode.h | 1 + 3 files changed, 11 insertions(+) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index e8e08f57196b..65b1f74d310b 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -5285,6 +5285,7 @@ struct fileops path_fileops = { .fo_chown = badfo_chown, .fo_sendfile = badfo_sendfile, .fo_fill_kinfo = vn_fill_kinfo, + .fo_cmp = vn_cmp, .fo_flags = DFLAG_PASSABLE, }; diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 40596263d551..dc2efee038bb 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -123,6 +123,7 @@ struct fileops vnops = { .fo_mmap = vn_mmap, .fo_fallocate = vn_fallocate, .fo_fspacectl = vn_fspacectl, + .fo_cmp = vn_cmp, .fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE }; @@ -4228,3 +4229,11 @@ vn_lktype_write(struct mount *mp, struct vnode *vp) return (LK_SHARED); return (LK_EXCLUSIVE); } + +int +vn_cmp(struct file *fp1, struct file *fp2, struct thread *td) +{ + if (fp2->f_type != DTYPE_VNODE) + return (3); + return (kcmp_cmp((uintptr_t)fp1->f_vnode, (uintptr_t)fp2->f_vnode)); +} diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index c244eb13294d..987cf995f606 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -818,6 +818,7 @@ int vn_vget_ino_gen(struct vnode *vp, vn_get_ino_t alloc, void *alloc_arg, int lkflags, struct vnode **rvp); int vn_utimes_perm(struct vnode *vp, struct vattr *vap, struct ucred *cred, struct thread *td); +int vn_cmp(struct file *, struct file *, struct thread *td); int vn_io_fault_uiomove(char *data, int xfersize, struct uio *uio); int vn_io_fault_pgmove(vm_page_t ma[], vm_offset_t offset, int xfersize, From nobody Wed Jan 24 05:12:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBt10PXz57SmV; Wed, 24 Jan 2024 05:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKXBs4RQsz4ZXp; Wed, 24 Jan 2024 05:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qnJRB7Oh8/wJIakof2al5P3H6hhBUZ+wN8D3cz6hqAA=; b=Crusv6UnitV75wuBWFkqrkZaNpYXuoG/PaoIpx7LxOsnW6ymt0CTCfznwzd6E97kX5hrmc CWJGYx3VMXRtrxBuQdhusN1VakHYEadwqvwT6lNUdtHfQGI5Fuvl+wZRGLqmnoMDCqaNCx O9aX4ftXRMTcnyNtfkyK/uemgGyh1m++6TKZ/DA5O6xbbBqV10k8Zgn3BuNDI6x7tlls8Y rvq/hZRmoJmptEOqGiKCNZMP6tlAAyDgyNNP+qNl6gJ3whBqa8u7uaVqDw6Bn13WWlRBAw Eam7fC3V/NwZV93K+XiS3xxaJ7rUjE2lraVNPzq5udz7Ysdo12F/pq/P2uJHnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qnJRB7Oh8/wJIakof2al5P3H6hhBUZ+wN8D3cz6hqAA=; b=fDckRH3n95i1ICVnGfXM5ItaGDJt61cr+/DjLQn/Sn6tLdp9uwJGsfWvxGW0u4nkIDWTcP cKySBooipvZ4TeOU2t3GRTWzwMot2Ys/4AQAmTTvgXl5DrjosCaHpYBP3BLDz2eHEiJ9bV ytJIF2ILIEK1VKdGrFJwlPmTFmMnqpQ+xnTUONX8pA2Rw+Ekf4FvrsZUEoKIuZ5ohrKYtC /zU9aQBa6zFi52gQZL47CpDPisDtXfGGhIjTAh9hLbjQu8SQ9qhCb+Cz4S/MIoHJas2xe7 1lUs7XBHaYIgwjZjpq/unNyfgPZy5sDkNnRLnSRGyUKOR+3PEFFIWsD+K05N6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073141; a=rsa-sha256; cv=none; b=g9+Bch6hj/mUv2Wk/oGU+7MHtalBawllIEaTucsdjod1Fuxg5QcHKd4AWeGJoD9qcpyvoj Xc6mBZBVng39SwEJw69xuGlYmT0bhuodiXm+IzCvLhr5LUGOLudBkyT79d0O5/Pndv291N 45tY8MFrFFJfecgY+THvV+tlblG4Q1DfPHt58iMeWij0teI4OETng26VR2EfkCuU/Ixp9S HNipXe6hNBx70e44i4jpj6pnzRiZrBXFRztbqhIRWgFRwoQN3YVizEoqu8VucMm65vIA6U ZBj+kLU+Bjxhdx3DwwqBzTH/pl5F3rz3kIKZkRo9mlfoRKYGH7WoYT8d414EiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBs3VVlz11Vv; Wed, 24 Jan 2024 05:12: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 40O5CLAW040232; Wed, 24 Jan 2024 05:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CLio040229; Wed, 24 Jan 2024 05:12:21 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:21 GMT Message-Id: <202401240512.40O5CLio040229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5c41d888de1a - main - kcmp(2): implement for devfs files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c41d888de1aba0e82531fb6df4cc3b6989d37bd Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5c41d888de1aba0e82531fb6df4cc3b6989d37bd commit 5c41d888de1aba0e82531fb6df4cc3b6989d37bd Author: Konstantin Belousov AuthorDate: 2024-01-19 21:36:50 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:26 +0000 kcmp(2): implement for devfs files Compare not vnodes, which are different between mount points, but actual cdev referenced by the devfs node. Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- sys/fs/devfs/devfs_vnops.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index fbb314dbbe79..3b8a624fe620 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -2010,6 +2010,14 @@ dev2udev(struct cdev *x) return (cdev2priv(x)->cdp_inode); } +static int +devfs_cmp_f(struct file *fp1, struct file *fp2, struct thread *td) +{ + if (fp2->f_type != DTYPE_VNODE || fp2->f_ops != &devfs_ops_f) + return (3); + return (kcmp_cmp((uintptr_t)fp1->f_data, (uintptr_t)fp2->f_data)); +} + static struct fileops devfs_ops_f = { .fo_read = devfs_read_f, .fo_write = devfs_write_f, @@ -2025,6 +2033,7 @@ static struct fileops devfs_ops_f = { .fo_seek = vn_seek, .fo_fill_kinfo = vn_fill_kinfo, .fo_mmap = devfs_mmap_f, + .fo_cmp = devfs_cmp_f, .fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE }; From nobody Wed Jan 24 05:12:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBv1TMdz57THX; Wed, 24 Jan 2024 05:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKXBt5bbQz4ZdY; Wed, 24 Jan 2024 05:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zgHXa+6/qLE/BXQ+gGyxhzfBwEpfy6LHijFGsIeeUsM=; b=uWX3E7Ao8oaNCMQLQq8ZH2IElxgTSti1hun/CxlhxsrPk4uLKDfzHyoFyB+ts9BiSlZVcT eCbcTyeRIGhkO9wrVd5j3rkNy9uQ0dd0FRD1JROWvmWK1h/tSS+Cc57cNGq94Gb0cSjg+x XSoY1GdpwWjA8npomrWl7+2aT9G+M9BHTAG6Ioaih4d8uK7FEnNTyTUfdz3pqMBlrRcVGY L/hNsVSBAFzSqNA3xbxoPxvap15p1pm4WCd0HB9HB4WF7CGRPBBkTZPI5Cwbm12DShxUiN ACXWWRjkAxc5D571wuVV+Tqe2W/SPKqJjAWTZu/GwIRX4uH/VwzlEx1H19mAYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zgHXa+6/qLE/BXQ+gGyxhzfBwEpfy6LHijFGsIeeUsM=; b=o3rQYM7bcmarFdKKcf9D90YG94Y7y574T+O/xWIVPx9a7s/fsP3TqCG+SEEtUf+ivQwMPR tAO9r7urdJr4FPob6qbSzo4nO9uIoq5L6S1pFLH1AgOrVDAcsKRz0kErvjop5x6ujjO835 Ugo8tMK/XMl6HJWLoi0DNTywhiEXrojmVY8wkTiavhFhZAVWhLYgzTZgQOf4P5JTAlc9fz XNkKPHvP5s4uzPvCrL9zLZH6y7ZIcBxCvTHelRrEC0QU5ciOzkgr3LzzEcf3OfA7rCyGaN 9Yo5jAd9flnXz7ch7gBpTXTknufXSnhsCExyvRCCrxrOvnM9HwNmQWff1TjtWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073142; a=rsa-sha256; cv=none; b=w6OiZX964+tbUhxOqKZn4j2+/7WVF2sryJcLdC16HW8Kzvi0aSKNstVZ3zZRpOaqkHowM3 JxUYbh+tRId5ZQojTKHA0/nqvKfUHJjzpd+P6mArHmT3+rYtlQlkRkTIhVQgZl6RbxxR5I KQWcb916f+MHf3xzfuYNVGQ3t6EXG8vnvGNkmWw9SWXuyfuxW3D5/a8xHMcRs77LA+gPvT fOP3WYjMuj07Jr3pMrA1Y+2V4SB6aBAbl+c4Idtm9PptRkP0bQN4/rr7PBAabCFWaNL/Bw 5mAfU+GFApIllne9T+wPLyFq5oMJMR+1O/IyMiTx9np5jcAddphr2qlgksWJPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBt4jTkz11Sj; Wed, 24 Jan 2024 05:12:22 +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 40O5CMYv041090; Wed, 24 Jan 2024 05:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CMuL041082; Wed, 24 Jan 2024 05:12:22 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:22 GMT Message-Id: <202401240512.40O5CMuL041082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 41fb6dc3d4df - main - kcmp(2): implement for linuxkpi cdevs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41fb6dc3d4df632ffacf91b5631a718442d129d5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=41fb6dc3d4df632ffacf91b5631a718442d129d5 commit 41fb6dc3d4df632ffacf91b5631a718442d129d5 Author: Konstantin Belousov AuthorDate: 2024-01-19 21:54:03 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:27 +0000 kcmp(2): implement for linuxkpi cdevs Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- sys/compat/linuxkpi/common/src/linux_compat.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 4a998a557514..36ed7b84cc94 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1721,6 +1721,19 @@ linux_iminor(struct inode *inode) return (minor(ldev->dev)); } +static int +linux_file_kcmp(struct file *fp1, struct file *fp2, struct thread *td) +{ + struct linux_file *filp1, *filp2; + + if (fp2->f_type != DTYPE_DEV) + return (3); + + filp1 = fp1->f_data; + filp2 = fp2->f_data; + return (kcmp_cmp((uintptr_t)filp1->f_cdev, (uintptr_t)filp2->f_cdev)); +} + struct fileops linuxfileops = { .fo_read = linux_file_read, .fo_write = linux_file_write, @@ -1735,6 +1748,7 @@ struct fileops linuxfileops = { .fo_chmod = invfo_chmod, .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, + .fo_cmp = linux_file_kcmp, .fo_flags = DFLAG_PASSABLE, }; From nobody Wed Jan 24 05:12:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBw1XSyz57TKf; Wed, 24 Jan 2024 05:12: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 4TKXBv6Qz7z4ZH8; Wed, 24 Jan 2024 05:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iKht9BB2olDfEUmQQGo+qrR8qqOyoxe6gJDNNL35Xs=; b=OC9ugUuyApbzANoXCwduhM+/I5gKPqCw58dH0UTGYF2E2yHWv1iSe6VdHc/gD9Nk40EW7Y aRyMG7oWwpjquHL1F7+LLPfbP/ShMxzvql6yh1Xt76llgOWdPSUXAotrcK7vvBpPQurdN9 dhjl24P8aM7f73Cpo3YC3pNAj+0CdV3cPgE0CEoGNlf4F60vLJcc0sjkbIW2jdQHyw+bI/ 6xVZhOK3BGTnD6CPyXvrfsPtCKHwc6F5nYOEN9JQGVgYGpkTF08y+NtE5UWgl33xCkH7pi IGw+UWZv8nOiYrtVt9ow7utUtsXM6TwDvQUIiLC6kIZY52KzxvH5L2mUOXDAiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iKht9BB2olDfEUmQQGo+qrR8qqOyoxe6gJDNNL35Xs=; b=b90BBEgUKW5kSdOFDWFsNzXt9QPbKlbJfpt/uFbr1B/z9P+Q89MxMMKaRf0IyqXDMCAmxX ysLmkSAOMKuB5bdXA4aphhaxWM4kVNheSFO85xvqH1fTAtvZS5GphrKgyV1hENLBeIQxDG uvnz5jM77ggan9ldQ1EAcdu9KlLX1gX1Q+VEGGKgC6mp0eFUOOHM/gtIVvaf8EXQh4aB/m UoOsbxO9ZExaNwOjSK2IGojF7H4eWefcZvSUDOBrcMbfS8mrJAicijGI3crKS3LlCN9aue 0TU2gz3X4Vs9jAWSEFbrLW1DsAXklsy1PCaPgqXb/+4C4h9Bp/We1mO40sjVMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073143; a=rsa-sha256; cv=none; b=KkkT2UWV6DVKvkmGfWoRLh+4ylr9RgvUq3pk/7E9+hIcYCvuPNJljeemQjZ/CC3/th+q9k koC4lEyrns7yMaykPKmU2XtDFIcywrFti5XrXnm+EJ/IJU2jQUntfJg44TqcaJJriT17WG 2vdEHH6kQ/IhSj11/DEOlwkVeg92Q4BRzKuWLzpmSjTa3CCgucWZkC/o3ggnvvwo2uswlW 7SsCvn6bJRBTtF7Iu8Gt6seBOJDcQiNsM7qfxBXKCj/8+0eazvSltL751QS75zgL/AvKso /lQszIfywnT4NShGB+VO+HVtlXH6630KZGl3ZRDe9AVNonvVPNR1pxWjSiAeeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBv5Vzgz11Vx; Wed, 24 Jan 2024 05:12: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 40O5CNig041300; Wed, 24 Jan 2024 05:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5CNWQ041297; Wed, 24 Jan 2024 05:12:23 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:23 GMT Message-Id: <202401240512.40O5CNWQ041297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f006524d6d69 - main - kcmp(2): implement for procdesc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f006524d6d696cc2a10b9e90a9a6ea412f1839eb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f006524d6d696cc2a10b9e90a9a6ea412f1839eb commit f006524d6d696cc2a10b9e90a9a6ea412f1839eb Author: Konstantin Belousov AuthorDate: 2024-01-19 22:37:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:27 +0000 kcmp(2): implement for procdesc Reviewed by: brooks, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43518 --- sys/kern/sys_procdesc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 419ff928a8a2..90022186d1ff 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -94,6 +94,7 @@ static fo_kqfilter_t procdesc_kqfilter; static fo_stat_t procdesc_stat; static fo_close_t procdesc_close; static fo_fill_kinfo_t procdesc_fill_kinfo; +static fo_cmp_t procdesc_cmp; static struct fileops procdesc_ops = { .fo_read = invfo_rdwr, @@ -108,6 +109,7 @@ static struct fileops procdesc_ops = { .fo_chown = invfo_chown, .fo_sendfile = invfo_sendfile, .fo_fill_kinfo = procdesc_fill_kinfo, + .fo_cmp = procdesc_cmp, .fo_flags = DFLAG_PASSABLE, }; @@ -552,3 +554,15 @@ procdesc_fill_kinfo(struct file *fp, struct kinfo_file *kif, kif->kf_un.kf_proc.kf_pid = pdp->pd_pid; return (0); } + +static int +procdesc_cmp(struct file *fp1, struct file *fp2, struct thread *td) +{ + struct procdesc *pdp1, *pdp2; + + if (fp2->f_type != DTYPE_PROCDESC) + return (3); + pdp1 = fp1->f_data; + pdp2 = fp2->f_data; + return (kcmp_cmp((uintptr_t)pdp1->pd_pid, (uintptr_t)pdp2->pd_pid)); +} From nobody Wed Jan 24 05:12:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXBx45Zgz57T11; Wed, 24 Jan 2024 05:12: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 4TKXBx1DDpz4ZYf; Wed, 24 Jan 2024 05:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DvFyP4oCgukcHTqWxeOnLhfjZA6WxkOHOhuUvgLAYdA=; b=mnm+WYRAzU5A5iDNEYeqCRAlepUVxvWJU27C2o6wJc1zcifYDGJ5bM6u6ZeiK7UnI2r6V6 rZ2Id8+Q0Wu9xvd4m7EJIxVGAsqsDIDeTU/6XiVDvKIwROv5aP4Wo7Xp+XQ94TWjDOlsF9 u/7Aw4KKVpKEknqnHyDF0PS2M1cHjKfZN38sO9ZdwkZHHw3aL3vj8kZIkOPiG6s3q2Mo5j FMUiKdXWyZt1KY4zb+4STwhhYI+8VrbbBFC0S3m/+QQdhF7NKMsDMLvRwuiakbGoblctCX o1kJ9nwraadgvsicqutq4BgF3JDQNF0bHTfNZRgOe/ZkDEaE/TbpEGwRJHgk9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DvFyP4oCgukcHTqWxeOnLhfjZA6WxkOHOhuUvgLAYdA=; b=HsENDgx1febIIKYaI3OCy3xR4WERT1GfRn2q6tSUcGlD5NEKEzsTkK/fvFLkI4bg0HtVnh m04z/n60D0GOGAg1nwm9KEaht7R9sEcdTUI11xVg8ABT2QI7idJy/BKiaGMJmKr7eUgDpX svHHGfDvROQXnjeyrCIWcxs1f3+49ZFILyDaG/qGDw51hhxyilsvDK1vkxO7rmPGD9AZ0U vpflJPsR6G0moFuaoQjH50SAUzm6JvTYMPP+ET2eynol1xaUTUWHX4bDUdYQdiRsMA5AqA 88F8bLN9iKMrey2EOXutAKoWH/l6hI27i59TmxqTzhZMjRajMuefjvuOWCPVhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073145; a=rsa-sha256; cv=none; b=n6B3ZvUkx4PHbl93uG1ci+N6UUj5W8iUU5u+P5eK9jpRy2yMJAw+JEoDGZW8l7B+X8f4gr cnqFX3vbr7gBosn6uqV96watHLTQADMkpkLQ5HgaIC0mz96WrcJC6qxz05txLRw5qdPTlZ CR5OjySJ4gBeyRNFk4tNzLo5r3UmAk8dgVefIW8qBVBLgiolKn7Zusw1WyJkKGV/HERe2G wcpKTdAayHM6CReMOQMF+UbEebQZgT2lCao1wfXy2CTaDKJThZLvZAxs8jqyNbyxs3S8UO GzYT3G0eFoPn/CL+PSGoa0mWaDTWdjHRkgLLOjIAqc23H2EhNV9vX4OGmbzsyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXBw6b8gz11lH; Wed, 24 Jan 2024 05:12: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 40O5CO5N041330; Wed, 24 Jan 2024 05:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5COYX041327; Wed, 24 Jan 2024 05:12:24 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:12:24 GMT Message-Id: <202401240512.40O5COYX041327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 38bfddf597b1 - main - regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38bfddf597b18615ad07accd923ce29a951eaab9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=38bfddf597b18615ad07accd923ce29a951eaab9 commit 38bfddf597b18615ad07accd923ce29a951eaab9 Author: Konstantin Belousov AuthorDate: 2024-01-19 19:55:42 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:11:27 +0000 regen --- sys/compat/freebsd32/freebsd32_syscall.h | 3 +- sys/compat/freebsd32/freebsd32_syscalls.c | 1 + sys/compat/freebsd32/freebsd32_sysent.c | 1 + sys/compat/freebsd32/freebsd32_systrace_args.c | 38 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 38 ++++++++++++++++++++++++++ sys/sys/syscall.h | 3 +- sys/sys/syscall.mk | 3 +- sys/sys/sysproto.h | 9 ++++++ 10 files changed, 95 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index bc824b8e04be..662947c330d4 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -506,4 +506,5 @@ #define FREEBSD32_SYS_timerfd_create 585 #define FREEBSD32_SYS_freebsd32_timerfd_gettime 586 #define FREEBSD32_SYS_freebsd32_timerfd_settime 587 -#define FREEBSD32_SYS_MAXSYSCALL 588 +#define FREEBSD32_SYS_kcmp 588 +#define FREEBSD32_SYS_MAXSYSCALL 589 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 3e7656cace72..b4c41fdbbc12 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -593,4 +593,5 @@ const char *freebsd32_syscallnames[] = { "timerfd_create", /* 585 = timerfd_create */ "freebsd32_timerfd_gettime", /* 586 = freebsd32_timerfd_gettime */ "freebsd32_timerfd_settime", /* 587 = freebsd32_timerfd_settime */ + "kcmp", /* 588 = kcmp */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 179d83186b41..13d80c695169 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -649,4 +649,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(timerfd_create_args), .sy_call = (sy_call_t *)sys_timerfd_create, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 585 = timerfd_create */ { .sy_narg = AS(freebsd32_timerfd_gettime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = freebsd32_timerfd_gettime */ { .sy_narg = AS(freebsd32_timerfd_settime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = freebsd32_timerfd_settime */ + { .sy_narg = AS(kcmp_args), .sy_call = (sy_call_t *)sys_kcmp, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 588 = kcmp */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 0d263b57bf0f..f2617872a952 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3357,6 +3357,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 4; break; } + /* kcmp */ + case 588: { + struct kcmp_args *p = params; + iarg[a++] = p->pid1; /* pid_t */ + iarg[a++] = p->pid2; /* pid_t */ + iarg[a++] = p->type; /* int */ + uarg[a++] = (intptr_t)p->idx1; /* uintptr_t */ + uarg[a++] = (intptr_t)p->idx2; /* uintptr_t */ + *n_args = 5; + break; + } default: *n_args = 0; break; @@ -9067,6 +9078,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kcmp */ + case 588: + switch (ndx) { + case 0: + p = "pid_t"; + break; + case 1: + p = "pid_t"; + break; + case 2: + p = "int"; + break; + case 3: + p = "uintptr_t"; + break; + case 4: + p = "uintptr_t"; + break; + default: + break; + }; + break; default: break; }; @@ -10945,6 +10978,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kcmp */ + case 588: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 74b96a27b3fa..467ea391ef23 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -648,4 +648,5 @@ struct sysent sysent[] = { { .sy_narg = AS(timerfd_create_args), .sy_call = (sy_call_t *)sys_timerfd_create, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 585 = timerfd_create */ { .sy_narg = AS(timerfd_gettime_args), .sy_call = (sy_call_t *)sys_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = timerfd_gettime */ { .sy_narg = AS(timerfd_settime_args), .sy_call = (sy_call_t *)sys_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = timerfd_settime */ + { .sy_narg = AS(kcmp_args), .sy_call = (sy_call_t *)sys_kcmp, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 588 = kcmp */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 323669158ac4..0e6e3a3dd1f1 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -593,4 +593,5 @@ const char *syscallnames[] = { "timerfd_create", /* 585 = timerfd_create */ "timerfd_gettime", /* 586 = timerfd_gettime */ "timerfd_settime", /* 587 = timerfd_settime */ + "kcmp", /* 588 = kcmp */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 5166223fe8c6..a7320cbe9377 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3444,6 +3444,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 4; break; } + /* kcmp */ + case 588: { + struct kcmp_args *p = params; + iarg[a++] = p->pid1; /* pid_t */ + iarg[a++] = p->pid2; /* pid_t */ + iarg[a++] = p->type; /* int */ + uarg[a++] = (intptr_t)p->idx1; /* uintptr_t */ + uarg[a++] = (intptr_t)p->idx2; /* uintptr_t */ + *n_args = 5; + break; + } default: *n_args = 0; break; @@ -9212,6 +9223,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kcmp */ + case 588: + switch (ndx) { + case 0: + p = "pid_t"; + break; + case 1: + p = "pid_t"; + break; + case 2: + p = "int"; + break; + case 3: + p = "uintptr_t"; + break; + case 4: + p = "uintptr_t"; + break; + default: + break; + }; + break; default: break; }; @@ -11180,6 +11213,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kcmp */ + case 588: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index cdc09a0edc29..1fa5878c6ff6 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -524,4 +524,5 @@ #define SYS_timerfd_create 585 #define SYS_timerfd_gettime 586 #define SYS_timerfd_settime 587 -#define SYS_MAXSYSCALL 588 +#define SYS_kcmp 588 +#define SYS_MAXSYSCALL 589 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 8c85dc4c349c..31e698ea2beb 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -427,4 +427,5 @@ MIASM = \ membarrier.o \ timerfd_create.o \ timerfd_gettime.o \ - timerfd_settime.o + timerfd_settime.o \ + kcmp.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 803144745a76..afec9d186a7a 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1870,6 +1870,13 @@ struct timerfd_settime_args { char new_value_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * new_value; char new_value_r_[PADR_(const struct itimerspec *)]; char old_value_l_[PADL_(struct itimerspec *)]; struct itimerspec * old_value; char old_value_r_[PADR_(struct itimerspec *)]; }; +struct kcmp_args { + char pid1_l_[PADL_(pid_t)]; pid_t pid1; char pid1_r_[PADR_(pid_t)]; + char pid2_l_[PADL_(pid_t)]; pid_t pid2; char pid2_r_[PADR_(pid_t)]; + char type_l_[PADL_(int)]; int type; char type_r_[PADR_(int)]; + char idx1_l_[PADL_(uintptr_t)]; uintptr_t idx1; char idx1_r_[PADR_(uintptr_t)]; + char idx2_l_[PADL_(uintptr_t)]; uintptr_t idx2; char idx2_r_[PADR_(uintptr_t)]; +}; int sys_exit(struct thread *, struct exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2268,6 +2275,7 @@ int sys_membarrier(struct thread *, struct membarrier_args *); int sys_timerfd_create(struct thread *, struct timerfd_create_args *); int sys_timerfd_gettime(struct thread *, struct timerfd_gettime_args *); int sys_timerfd_settime(struct thread *, struct timerfd_settime_args *); +int sys_kcmp(struct thread *, struct kcmp_args *); #ifdef COMPAT_43 @@ -3246,6 +3254,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_timerfd_create AUE_TIMERFD #define SYS_AUE_timerfd_gettime AUE_TIMERFD #define SYS_AUE_timerfd_settime AUE_TIMERFD +#define SYS_AUE_kcmp AUE_NULL #undef PAD_ #undef PADL_ From nobody Wed Jan 24 05:13:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXDG4G5Xz57T1d; Wed, 24 Jan 2024 05:13: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 4TKXDG3Nsyz4dwG; Wed, 24 Jan 2024 05:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3oHtDGoexQKgVnnHlXZi0cPrSJcCDa2AWZwLqfslpI=; b=j7fc89NPF+tSOXYBTWynd7lsGg4Sjri8B8FuEtXb5kdkFTPcIzoj0PXFIG/TCW2Yl20Z27 cfe9el4vNXSHgj4VFjFz5MXmynWhEt8ABOjZU+J3mwPWbqIDKsHBH294Pr+wV9JvbXe2wq udDMha5ZY9g6o5594GFhxqDBpx4rw4Q4uFuxpHnoyT2XKYRtZkKqJlyFcvsz+Es9iKElXs 0NVLsd5cnowQ6rLwb13N9kHpeJKLAzSHWlOo9I1tVxfQvZHSmkKa6IIDiiZeaxV/UBt0MI /AHymlHDyV8tygbXsq3boy46k3cdEmB0DTFuyxcp/3XodZDeEew+yrRyWv+BTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M3oHtDGoexQKgVnnHlXZi0cPrSJcCDa2AWZwLqfslpI=; b=lVlNXZnInAXsovRRwJGa7nEfQYj8mFxEOGauOf0QUSG60WLNKKstJsqXuPoe4NEBAsPkEr 2Kk8Vu+Oe6LofTgwoIq0/OCzvobXEhZEwKn2GHjDiIEhzbIajNjE0efH+NAiGYSgBWt8eT 8qmtUbK7JDOiNCehW/pXA5vnvTwqQchwZC/0FBmyK+FZpVw1T03McRrREUaO9S7pVPsWL9 rkE9zVEA53qENMNgTPULFswVYDmHnh3RJsVQ8xyY2rKfrnPLGk3sSvjOKuITpXgirhKJEq WbCaJOVhfOety3WwNzD4Fxbke5sPFf8NaC9pW+X1ULrplshM5JuwLrMg+Z+nZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073214; a=rsa-sha256; cv=none; b=kstX1Ni0+F3aDfsoovFz/wn+CXb3dLCdZ0HknJB3cO6SO7gyUwZEVoAFO3nZY8UupWE6+V OK34RfI1lxnwPZOl5NZUdu3CFK0M1dLrlB0uDTQbnUowsJpJBoSqALuXEBMgUoPn9tN4By tx26qG5yR8E9uL6GfqoQl/LFBw9Ks0B7x4Cl0C0inauhq2ldIsbLs7HEWkcviQUdhmRXOG 4zwuEfHg+f4W0RsLMEIEeVx8OJbe9huOLpgJTK8zH0F+gjGZdejAWOxxy+J/Ob5XK2JNtT iwO7z6ChnhNStNi3CjVyMGbowh42GVNrfxyve3b6Lqvw1gyjkD9cjackU3bh6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXDG2S4yz110p; Wed, 24 Jan 2024 05:13: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 40O5DYmT041718; Wed, 24 Jan 2024 05:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5DYkV041715; Wed, 24 Jan 2024 05:13:34 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:13:34 GMT Message-Id: <202401240513.40O5DYkV041715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2a284076ecb4 - main - kern_openat(): rename fd argument to dirfd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a284076ecb4d22928b78249070efa46153666ff Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2a284076ecb4d22928b78249070efa46153666ff commit 2a284076ecb4d22928b78249070efa46153666ff Author: Konstantin Belousov AuthorDate: 2024-01-20 21:41:12 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:13:25 +0000 kern_openat(): rename fd argument to dirfd Reviewed by: markj, pjd Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43529 --- sys/kern/vfs_syscalls.c | 6 +++--- sys/sys/syscallsubr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index c739b5d5beaa..cccb24257e11 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1111,8 +1111,8 @@ sys_openat(struct thread *td, struct openat_args *uap) } int -kern_openat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, - int flags, int mode) +kern_openat(struct thread *td, int dirfd, const char *path, + enum uio_seg pathseg, int flags, int mode) { struct proc *p = td->td_proc; struct filedesc *fdp; @@ -1159,7 +1159,7 @@ kern_openat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, fp->f_flag = flags & FMASK; cmode = ((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT; NDINIT_ATRIGHTS(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | WANTIOCTLCAPS, - pathseg, path, fd, &rights); + pathseg, path, dirfd, &rights); td->td_dupfd = -1; /* XXX check for fdopen */ error = vn_open_cred(&nd, &flags, cmode, VN_OPEN_WANTIOCTLCAPS, td->td_ucred, fp); diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 2c3059b27c82..50dc3ad7d126 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -251,7 +251,7 @@ int kern_ogetdirentries(struct thread *td, struct ogetdirentries_args *uap, long *ploff); int kern_ommap(struct thread *td, uintptr_t hint, int len, int oprot, int oflags, int fd, long pos); -int kern_openat(struct thread *td, int fd, const char *path, +int kern_openat(struct thread *td, int dirfd, const char *path, enum uio_seg pathseg, int flags, int mode); int kern_pathconf(struct thread *td, const char *path, enum uio_seg pathseg, int name, u_long flags, long *valuep); From nobody Wed Jan 24 05:13:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXDH5SqCz57SxH; Wed, 24 Jan 2024 05:13: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 4TKXDH4Wswz4dwJ; Wed, 24 Jan 2024 05:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJvULpIFiaWipNHFRJQv6lBSxtQtc3vseaavSRzFqtw=; b=JrCVtX4z3AfHqK++/N6R7gX+Phtj7u3ID79dfGX9HNA1zojR+XWwLjZ6UlWljS8BddhNSf i379Sy+XCqTdMuSKxT3Db1DzglAscOF8fTs6zxiOLBcQoitLbnIQXmoozAXVRgKllMch6g 1UEuS3+L8FaOdsVg7ct5WT0M4WJDiSyDjWTGf9Z1Q9wdXSikl96lePK0AHWCi3y7LGfi7F QBuW+tTGkv1W0sMd0xZub3gENBI7OLYPhcJV/INl1H6aeJhkwgqcV/5I2EjTeZsGzsSKU7 qEm3qe2Wfu4j9BOq09hchadtjVyZIGBQ0UY0gy6bwHK3xmk6VRy1zS2P6/v6kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJvULpIFiaWipNHFRJQv6lBSxtQtc3vseaavSRzFqtw=; b=FqL9dhynll4O4z9UfR/A2nghmSeP3ZncpkbBq1MxqL4uZDv9YzZe1y3JXPZFOcrKkoeZg9 cAXyQz/asfJlM0b3A7H9ToscYeSJiCaoMuP8W9BXTyuD0ABDEi7OhXQvCqmfCjoZDrhf8S yzpEgxifnPaXvELA/nBLGDgo9oZkJFh0qEGT+4S6oso6JNOEgi1bz4xz+puW6zAZBQ2zFJ 1VibHTPTEzco0HdhSHcAKSTHzNIAJgFzSsKj1YnOZAjVavCE/l5HUJzRSB7nKp7G2A7WkO zCLKGNlt7TRCReikcK+eUM7BJ5Mrv1KhQigdyyU/XkswPZI/Rk+dC8XUbffOVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073215; a=rsa-sha256; cv=none; b=U3sCzA/cpRdrU1SE+UuFMnfpQZjrwYl5QUNZqO7Z8pDImkTw2AiAwYEsNeL5Mrh88BCLoy 73AX/31NBlNVAcARQkLQgPKxC17KoecHITnsj/oQyAZf0gRByzxfqQ6dM9AGbuEWnGqdhi R+cNP5Xvarei87Wv4fQ9C9mht/9rumcfb807yKjqkxHBVdgobnW79pRpqhXtwtJdxm54dD ZOkV0n9NlhZ+hsV1EdYO2Lc5Yp5ucAvKjIj2n7LnnBOFxno2g2Iww1QSdCqo7n1kwiUC1X Lx/rbinkyRZqOeBREpgO5/vytTyMXu5gLO+9tJc0ps9JRpyicb9md7RUU3gzdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXDH3cwlz11W3; Wed, 24 Jan 2024 05:13: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 40O5DZkn041763; Wed, 24 Jan 2024 05:13:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5DZsk041760; Wed, 24 Jan 2024 05:13:35 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:13:35 GMT Message-Id: <202401240513.40O5DZsk041760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3d59b93b207e - main - kern_openat(): minor style fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d59b93b207e5008ea0b79b38268243abf225546 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d59b93b207e5008ea0b79b38268243abf225546 commit 3d59b93b207e5008ea0b79b38268243abf225546 Author: Konstantin Belousov AuthorDate: 2024-01-20 21:42:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:13:25 +0000 kern_openat(): minor style fixes Reviewed by: markj, pjd Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43529 --- sys/kern/vfs_syscalls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index cccb24257e11..5d065e638203 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1114,16 +1114,18 @@ int kern_openat(struct thread *td, int dirfd, const char *path, enum uio_seg pathseg, int flags, int mode) { - struct proc *p = td->td_proc; + struct proc *p; struct filedesc *fdp; struct pwddesc *pdp; struct file *fp; struct vnode *vp; + struct filecaps *fcaps; struct nameidata nd; cap_rights_t rights; int cmode, error, indx; indx = -1; + p = td->td_proc; fdp = p->p_fd; pdp = p->p_pd; @@ -1229,8 +1231,6 @@ success: * If we haven't already installed the FD (for dupfdopen), do so now. */ if (indx == -1) { - struct filecaps *fcaps; - #ifdef CAPABILITIES if ((nd.ni_resflags & NIRES_STRICTREL) != 0) fcaps = &nd.ni_filecaps; From nobody Wed Jan 24 05:13:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXDJ6wKVz57T3q; Wed, 24 Jan 2024 05:13: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 4TKXDJ5VX3z4dsw; Wed, 24 Jan 2024 05:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pa7E+lbHW8cbmeBA/YjU+U0PUW+r6nwNGU2RTQytfLs=; b=oqEuXS5HdCps+sREN2P8gX3fSZXNGC1f8YPcxVchhM17xii9GhD30Vf+vUmq6vGVt3nne/ 69cuOn2tBlUttiGMxRDv94nAAdrF8xeq5BnvoSisXTQJ++VXjjrV/F91K7oc7pD0oiSzcm We0C85Oh6lbfrd1nd5Yr2YHD10oOAYmDDv9DdBYQ/gFFGG02TpAUhPN/6vJmCUUMH6prlr hp6sfzkBq2H2wo9Dn7YvEgT93R0sT2Fw/I1OuMMI0j14xmo6UuVV1Ky6BOhXHjhxJccM5B Ao4r3kY2kxJZx/KuiO91i8Gj/olgPvqHIdd0JFncrUooUwAWB4mUu0aoAeSSgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pa7E+lbHW8cbmeBA/YjU+U0PUW+r6nwNGU2RTQytfLs=; b=giPjvjt3t19dJX6bDWIUI4yq+P5Hvtowu3e0/EhZNLEiET3kRh3y07ocGbG4UhUkuKGwv1 56KNWQ296CTAKguCbprTeNJj67wdqeJwnyFdNjG3fDYSa72sxoPt9/gyI9zOprNl+NmA23 4LiFOSwnhbicaBVU7exDqF0dviVkRs2ypvVwvyIuP/v66XsbjU2lqMNl0GOjHlnoUOcyaK rHaIo+KDsJkvJMSVSiZlGJHQmkz/I+kpuQ0IeSE3BXrYUVdnt/PsEvTq2+zbHzbnJUHMs5 AXpukSAhggYMqWawsACCirM0WNAW/T5bb/kjSN/kr9+C5jDq26mApgbcRVcw3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073216; a=rsa-sha256; cv=none; b=sqOrLmUngqPTt6Z7/DWkni0Tc789eJnQHwvQ9TnZUuBWoE5YX7bDk3uh7lFpm+Qf6oOTO8 ctz/FdMqUp7hy2a3uRUCQAYNjJf9QA8B7lq3jcOrXLyqtoFNj6xxovQwPeXTRZx3AbUoVm qjtAiVAkXzBhfz+ymKJEISWA4qjbUs+J1iTXkYTTVOBw5oAmbyUF9FcrMPREK1/yCFngZ1 W9WJE+u1pzWT19YFL6VKm65do6/+8PIRI1a42PFSGu2yVIlWTl+e0v4Xt0iAd7PvmUlF+8 FoN4AzFJZZUfwHMmS/1rnHVqmCatOV960RyMyx9R4jNfCGGDmqjlWiFobKqfzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXDJ4ZvZz11Sw; Wed, 24 Jan 2024 05:13: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 40O5DaJ4041805; Wed, 24 Jan 2024 05:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5Daih041802; Wed, 24 Jan 2024 05:13:36 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:13:36 GMT Message-Id: <202401240513.40O5Daih041802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c662306e19ce - main - Add kern_openatfp(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c662306e19ce60d0f5e5e32a22ddcd5c79a90849 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c662306e19ce60d0f5e5e32a22ddcd5c79a90849 commit c662306e19ce60d0f5e5e32a22ddcd5c79a90849 Author: Konstantin Belousov AuthorDate: 2024-01-20 20:34:46 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:13:26 +0000 Add kern_openatfp(9) Reviewed by: markj, pjd Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43529 --- sys/kern/vfs_syscalls.c | 39 ++++++++++++++++++++++++++++++++++++--- sys/sys/syscallsubr.h | 2 ++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 5d065e638203..c9a039515a77 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1110,9 +1110,14 @@ sys_openat(struct thread *td, struct openat_args *uap) uap->mode)); } -int -kern_openat(struct thread *td, int dirfd, const char *path, - enum uio_seg pathseg, int flags, int mode) +/* + * If fpp != NULL, opened file is not installed into the file + * descriptor table, instead it is returned in *fpp. This is + * incompatible with fdopen(), in which case we return EINVAL. + */ +static int +openatfp(struct thread *td, int dirfd, const char *path, + enum uio_seg pathseg, int flags, int mode, struct file **fpp) { struct proc *p; struct filedesc *fdp; @@ -1186,6 +1191,7 @@ kern_openat(struct thread *td, int dirfd, const char *path, if ((nd.ni_resflags & NIRES_STRICTREL) == 0 && (error == ENODEV || error == ENXIO) && td->td_dupfd >= 0) { + MPASS(fpp == NULL); error = dupfdopen(td, fdp, td->td_dupfd, flags, error, &indx); if (error == 0) @@ -1227,6 +1233,13 @@ kern_openat(struct thread *td, int dirfd, const char *path, goto bad; } success: + if (fpp != NULL) { + MPASS(error == 0); + NDFREE_IOCTLCAPS(&nd); + *fpp = fp; + return (0); + } + /* * If we haven't already installed the FD (for dupfdopen), do so now. */ @@ -1256,6 +1269,26 @@ bad: return (error); } +int +kern_openat(struct thread *td, int dirfd, const char *path, + enum uio_seg pathseg, int flags, int mode) +{ + return (openatfp(td, dirfd, path, pathseg, flags, mode, NULL)); +} + +int +kern_openatfp(struct thread *td, int dirfd, const char *path, + enum uio_seg pathseg, int flags, int mode, struct file **fpp) +{ + int error, old_dupfd; + + old_dupfd = td->td_dupfd; + td->td_dupfd = -1; + error = openatfp(td, dirfd, path, pathseg, flags, mode, fpp); + td->td_dupfd = old_dupfd; + return (error); +} + #ifdef COMPAT_43 /* * Create a file. diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 50dc3ad7d126..c99eebd6d5d4 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -253,6 +253,8 @@ int kern_ommap(struct thread *td, uintptr_t hint, int len, int oprot, int oflags, int fd, long pos); int kern_openat(struct thread *td, int dirfd, const char *path, enum uio_seg pathseg, int flags, int mode); +int kern_openatfp(struct thread *td, int dirfd, const char *path, + enum uio_seg pathseg, int flags, int mode, struct file **fpp); int kern_pathconf(struct thread *td, const char *path, enum uio_seg pathseg, int name, u_long flags, long *valuep); int kern_pipe(struct thread *td, int fildes[2], int flags, From nobody Wed Jan 24 05:13:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKXDL0MJ3z57SxQ; Wed, 24 Jan 2024 05:13: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 4TKXDK6Dd0z4dr1; Wed, 24 Jan 2024 05:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLszs25+0AysWCfXxYEL+EHC2TZCdhSYGO/JbElbmA8=; b=q7fvU6oKkIrdJ5BzxJmqKBD6hEO0Dy1QKnZaXPFqOb7/wlLC5PVgQS9UCCo1YUUuNeoOGh PJGDXi+KIKNB6cXISfwSyh2Y3QAcJArbT8xkEsJT71yJB6Uqa8ZTAI2gxiTNXQ3SclWvtB rCSAt7d5xnbOdf89JySLW3/zxOvqR0t1BW8OVDJtsfkI30D3uHju3+VTMLeJ7He75srfKJ Z4BrENZxFcG1l3lmmUTsIrVXORsIUP+3h4xKa9zKS7w0tJGaMl4WorwXDd6vvy/mWYWv73 LCnFFcEMr1dOwPxsjDWzN5mNxu3auzMFKi+Eeqpjhg/1VYtiOSEo1vHxDbY4IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706073217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uLszs25+0AysWCfXxYEL+EHC2TZCdhSYGO/JbElbmA8=; b=gKYYsVfbg5Y9kss+BwCtLqKwok97EPLbyvgS6tK2hrDAe0UuWkYLDDc8pCSxNx3+GS0AH+ MpSa8FkOorOnsNIapeHuBFPIKsxRxlIwvPHINoUclgNrKNVzOwsM4D7xvFiJXPEN5gpS3P wOov9wt+HWud3vB2bIYxtCgYfV/1KsDYrsGSxtG3pqpm7Sx0bMwCVhZexwzrpC0TLdbjeH YKbXdxDD0IaW9uTJVAaUE9+zt5yTc4YBB2VjaoiaUMMlfWuM8PA42x9ZXwtFHaxtuNXia6 iKktbeunXXSj9JkzmuSEp8MW2AsXyMPzud1SVBJJLaUcpCaS4cDmegkSJxnNjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706073217; a=rsa-sha256; cv=none; b=JQEq/TmLhgVdggwKmnAaUieTRhRWr6ln35FbfGUjQQr96zpv68vnULjLcQ3i2Q6GNElAJr BSnW55yzGhFixFx17YDcwXrW/h+K5N/MCjvtOQrxRXeDGkuqUegMgEq/ooOyVQwCodn7dj 5RbjvZYWSWXRg0zb0z5EAl9VRaiEJx1OADQE7HggyuOuww9SqV3/preZ1mDniVBdgF4lXR b1/w2gdc2zQLTBTBBAz5ZXqLA1U96c93TEV+djPbnH0hb8q/zoccgjG2rM3yDUs1+4d0X4 E8wpbU4dqEG0E3wFf93Y0oByzUv7bH6FpoHfnfTuCMdrTJ97oZfW7ejCwKPagg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKXDK5LKfz11W4; Wed, 24 Jan 2024 05:13: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 40O5DbeV041850; Wed, 24 Jan 2024 05:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O5Dbco041847; Wed, 24 Jan 2024 05:13:37 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:13:37 GMT Message-Id: <202401240513.40O5Dbco041847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 120ceebab5d4 - main - Bump __FreeBSD_version for kern_openatfp(9) and kcmp(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 120ceebab5d4947dfc80d7492effa034a925d43e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=120ceebab5d4947dfc80d7492effa034a925d43e commit 120ceebab5d4947dfc80d7492effa034a925d43e Author: Konstantin Belousov AuthorDate: 2024-01-23 22:57:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 05:13:26 +0000 Bump __FreeBSD_version for kern_openatfp(9) and kcmp(2) --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index b5a5398497e0..3f99ee36e4af 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500011 +#define __FreeBSD_version 1500012 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Wed Jan 24 08:56:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKd974dQfz57q2L; Wed, 24 Jan 2024 08:56: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 4TKd9742VDz4vwb; Wed, 24 Jan 2024 08:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706086571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6RHKnNJY0fCdHftPlpWXeXAmNO+JB2nd+VsdgOnQsSY=; b=SkqP0tlUwvif1R2++7BYj0uZ0DaYguSGHO0IT2hpyM6i4nkH9eGpyygw438dytwwBO0P8d 2ctFUIGmouZ+tVUJdHVjjlUWS3xbJmvC7m3OZmcGfykfEr0mDH1/ewKd/JU7MeulxYCAN2 imgJ+nYuPdWgv7MvWtdEfaTcip6RjkmX46tpihgc/bgcLqveY/eVmRPaAIdwxcRUsIEzXm RAmRzYBN+GHQwpYotbIYRTvSa3RFn/r1xuMePElnetTmDbgmMbitPyP3qV9JI2ybwwyDQu YYjVNU9whYB2S2HhAENk3gA+a/kJ8wSunp7znBDkZI7ovQengRKcPUr9zspd5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706086571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6RHKnNJY0fCdHftPlpWXeXAmNO+JB2nd+VsdgOnQsSY=; b=PB+2ir5pV4AVoWQufhDyi7y1O6kkLhwfi2ythZkPw0pbyf+l95bmCXth4DcpRS0Uv0R3Bz lP55kBTCI8jR4jC8bx4UgFfM5SmRTzb2X3jNeDGSL3Ndm8UCK6jNHTp+jLRZV9TrjQDDQb xVT3jWmzFNNN3ncVeJIZjDAmqAgL55xF5x3gJrT/QrcqDi+CC5+VV8cGZjwqBLM2oGROxx mBk7CJps/VF4O+wxKiVrXQgZEQiKESymMY9JXHW2Da7tJ/ELG1Uv5DdOzot+CtE+kIETlX 7ndCM5deHvq1tCi+zYGhbGdkdGA0F+WPzgHMctgke0gyn9ERHncqtN69MMWpQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706086571; a=rsa-sha256; cv=none; b=hox0vaiuS1SyCXs2YcnMBK1bx8B4SBl+kEazvASPpSnuquANSksP48J3XWdPG+TfioUorX 76ASzNZITELIlW6elyDDGdkkavAluQ/z/iXbjlIK5/Bagtw5iU3g/bTqKprLhk7G0UlUXz rCZP2USB4RwYhcK9F7XscutD9mNZ7J/jIrkPje3pS+Yn5dMldZk4aYRkJR98HAamyQ3ILY ZofsuwXwkzSDdzoLk4RmFuyp+xiC1BAmeNVu0XwMAKMoy5d8doWL0XMSStP94soGBK3ZTl 4xT6y+8JYJdjVOnLADPk/NnTEP3GLagdgaOyijWGoMP8mOVArng2B+ds3TuJ9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKd9735pRz16V2; Wed, 24 Jan 2024 08:56: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 40O8uBwh010155; Wed, 24 Jan 2024 08:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O8uBv3010152; Wed, 24 Jan 2024 08:56:11 GMT (envelope-from git) Date: Wed, 24 Jan 2024 08:56:11 GMT Message-Id: <202401240856.40O8uBv3010152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: d7e45d5b9002 - main - stress2: remove the usage of fdisk(8) as this is soon to be removed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7e45d5b90025aa1c275fdfa783051006ac4b0f9 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=d7e45d5b90025aa1c275fdfa783051006ac4b0f9 commit d7e45d5b90025aa1c275fdfa783051006ac4b0f9 Author: Peter Holm AuthorDate: 2024-01-24 08:54:17 +0000 Commit: Peter Holm CommitDate: 2024-01-24 08:54:17 +0000 stress2: remove the usage of fdisk(8) as this is soon to be removed --- tools/test/stress2/misc/fork2.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/test/stress2/misc/fork2.sh b/tools/test/stress2/misc/fork2.sh index 1cb66fff34c7..4dbe2de3f6d1 100755 --- a/tools/test/stress2/misc/fork2.sh +++ b/tools/test/stress2/misc/fork2.sh @@ -49,9 +49,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint From nobody Wed Jan 24 08:56:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKd985KQqz57qD1; Wed, 24 Jan 2024 08:56: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 4TKd984nDwz4vwd; Wed, 24 Jan 2024 08:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706086572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wInMDw7RYbHc5H9VyFg7sTDtjEQ6pS6WwcHFzber+4I=; b=K7r6xFYGOqSaMxNCPG6vf7Tqqf+n4BgtqlKNO31EfmtMGnKFIDrGJW/HauAH5X42n4/SHr bGN7/VUdbLwPT29UZMAazKgc88RFh+YFGretBnh9aKNyfo9ms70pqf0BLHR0SkM/Bqa2rn l5brFAoEbe9u7zM3KbWEwJwOyeVxjNnRgiqQGXjODGLnblINpuJRkLAod7LmPZmnnwTtU7 LlrstuCuKO87bIemZv6ComPx3GQu5xyzdqTMeyivZ5uEQ08TTJCpSjIjkwuIGtHcJB3cqy iWZHtviucWRj8HJATcxnAV0dd4WiXVuLFmEdzeZUesqPLIc2He0jMpNJob6AFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706086572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wInMDw7RYbHc5H9VyFg7sTDtjEQ6pS6WwcHFzber+4I=; b=CbAN2TDzXqu7NDfBU8FLtxIAEJUKjTelZvJVURgZpD/TOHPYHHp6HmP+5NiXNIp+RzakYR PK0tR8tLDmOWKpRKuYPHHCfhRk+89YjnHlrZ+2IFNDYTUil4bqzMTA7EoRc9UqyADyTJaZ +wab3iPAL4+TXyk/7H5wsqGQBnw5KIFBhgRmmk7AXTA5JcllJlZc+XzQF1JQxuJJ7+UP0F 4WRRTCUnZohesaNTYsYCe8LT+1B6y/6AY7xFdhdBgc+0rQ7Cy/x0I2tq66YhWhYruw/KGN KA3No+jiSJhAI59JF9hu1ovar+l2ulme1zk6kRHYvIMXIzgwRTldO85v2obHKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706086572; a=rsa-sha256; cv=none; b=XnG7Ab7/bXKCRiRPoctXFR37rstZCx44dHU7I/HkyrrzdcLvY+ap4WswtqCGJmPvobf7B8 6NQELs4vOBPJ3zkW5VITC4F2JrYPJT7LzCmKbTQenhQ7OjB8WTlD3kw3fhrPncu5JJfJJu S3OtQcJQ8OSLPcmSLBhTqVX/T2jLt0M7mG2EeK6R9zho+X+sChlGOQTI/8ym2Jq2WZPext ScXcBiNtMAgcVWX+MeyjyWc9+bPNYR41MK4bIqt+yTmmKEGkQjemlYWlA48Xvprq/v7BtT 3D4J3ff6GI3TH5M1tlHIKeSO9FnFp7pc5gONLOW/EWDZdn+RMgKsXTyKmhkb3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKd983rGYz16V3; Wed, 24 Jan 2024 08:56: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 40O8uCnM010197; Wed, 24 Jan 2024 08:56:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O8uCiw010194; Wed, 24 Jan 2024 08:56:12 GMT (envelope-from git) Date: Wed, 24 Jan 2024 08:56:12 GMT Message-Id: <202401240856.40O8uCiw010194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 7304bd7a526c - main - stress2: Remove fdisk(8) regression test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7304bd7a526cbfc049d0348fe72c93f5309065d0 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=7304bd7a526cbfc049d0348fe72c93f5309065d0 commit 7304bd7a526cbfc049d0348fe72c93f5309065d0 Author: Peter Holm AuthorDate: 2024-01-24 08:55:34 +0000 Commit: Peter Holm CommitDate: 2024-01-24 08:55:34 +0000 stress2: Remove fdisk(8) regression test --- tools/test/stress2/misc/md4.sh | 44 ------------------------------------------ 1 file changed, 44 deletions(-) diff --git a/tools/test/stress2/misc/md4.sh b/tools/test/stress2/misc/md4.sh deleted file mode 100755 index 0d760b99b058..000000000000 --- a/tools/test/stress2/misc/md4.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2013 Peter Holm -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 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. -# - -# Demonstrate data corruption on the swap-backed md. -# Test scenario by Nigel Williams . -# Fixed in r250966. - -[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -[ -z "`which bsdlabel`" ] && exit 0 - -status=0 -MD_DEV=`mdconfig -an -t swap -s 1m -x 63 -y 16` -fdisk -I md$MD_DEV > /dev/null 2>&1 -bsdlabel -w -B md${MD_DEV}s1 || exit 1 -dd if=/dev/md$MD_DEV of=/dev/null bs=64k status=none -bsdlabel md${MD_DEV}s1 > /dev/null || - { echo FAIL; status=1; } -mdconfig -d -u $MD_DEV -exit $status From nobody Wed Jan 24 10:05:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKfjg0ncdz57x71; Wed, 24 Jan 2024 10:05: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 4TKfjg07hbz4634; Wed, 24 Jan 2024 10:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706090759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZxNvih30DzHq7wfgbfjzE4jLee5zGTDLmfzxcl9m11A=; b=J8tGLEP5OQTBa27eH1zx+7ikjBdLTM3d4H2QyIKvQ+A5VAdxYGQ7lfM8sS2a8xDFqsNucH Q1OnIUJwkwSB+u15htsjvHgdoPnLJiolPdaY7JlzJQQWMMx9bPss+WIVizDTflYq2K9PfP 5B4n6Mfczkpkh+m3mQswM4+AlDnpfA5T5XE+OYnnCoitBiu4teK55qwgIUJz11wDIBJdbd zjqaqTUj0V9/7jUU/wf40YNUwwkiUJ6wkExr+H41dMpj2veGYScnLIwlS3txO2smOCLQ2W YSAFzrHktTkBqSxzA6A/7PtqYZnsz5ru09V85Up1xsDVDwUZjN5hwuypag3AdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706090759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZxNvih30DzHq7wfgbfjzE4jLee5zGTDLmfzxcl9m11A=; b=he6bkg91LPfN7rRKBTSgDND5aTyNCtLwaqpplYWGLnmIdgbVoXmV4IDx6Xt9Pyeond4qr0 8kzEcvSFhUo+WXp2GsoDgrUxYTY24zyf+K5UXNhN8hehGj+tW/Z9+Y2myJ5hVT92CQ98oa 0MutGq5dE37LLxhmvd7UXc7qRZIKzfS/Ccepp4vh3h8aCQa+2WAM+clEBAfu2BlykHPT68 1U58zBmXj5tKoEwO90hn5KYowV9KPxKuJ+o0AgyDGCVyjXYCbz9kvdMtTNuWhaLd57UEFM EueiU4LJ4Fp1M99aO4JCjaLUQLi5G8PE3Ul4/vNW70i5E59cTf5vq+GGjoYwvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706090759; a=rsa-sha256; cv=none; b=A60jb6EulZVWt9kl7RyKGvdYoxuQYGvakQF/y3Zphlt1MF0U42AWhvDOmpO98/dQTJTnp2 VRBakN4OEFg1sMX6JlNpM/o05bs13pOOjqxeH4Ov1Dgnyz4mtiStjVHkcgEO93zIU9AsTQ 1vV4ev72PxeTmFeWxBFYX6cd0OXZa62mbLPgSGTFI1gwxpltrOOysBCfJXbnCymcklRa9w h81ERifn2EgSgLooBA+wW3uPNssZaQydKOulQgKy6qcI/uD+/+vYXRQB0KU3FdM8BgBcNQ LDHGvKREiWXb4HzMWISuNC3kC0RawAsqmrq7vI2hCWoQdgA18/vZK8gDVfczYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKfjf63Rlz18Qd; Wed, 24 Jan 2024 10:05: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 40OA5w5r029145; Wed, 24 Jan 2024 10:05:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OA5wob029142; Wed, 24 Jan 2024 10:05:58 GMT (envelope-from git) Date: Wed, 24 Jan 2024 10:05:58 GMT Message-Id: <202401241005.40OA5wob029142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tijl Coosemans Subject: git: 95bf75895ddc - main - join(1): Fix ordering in case of missing fields List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95bf75895ddcf17402b1f69dce26cb821c922476 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=95bf75895ddcf17402b1f69dce26cb821c922476 commit 95bf75895ddcf17402b1f69dce26cb821c922476 Author: Tijl Coosemans AuthorDate: 2024-01-22 10:35:31 +0000 Commit: Tijl Coosemans CommitDate: 2024-01-24 09:58:00 +0000 join(1): Fix ordering in case of missing fields The comparison function had the ordering reversed causing join(1) to miss some matching lines. PR: 232405 Submitted by: Martijn van Duren MFC after: 1 week --- usr.bin/join/join.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index 09263ea16c22..b1be8cd81690 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -380,9 +380,9 @@ static int cmp(LINE *lp1, u_long fieldno1, LINE *lp2, u_long fieldno2) { if (lp1->fieldcnt <= fieldno1) - return (lp2->fieldcnt <= fieldno2 ? 0 : 1); + return (lp2->fieldcnt <= fieldno2 ? 0 : -1); if (lp2->fieldcnt <= fieldno2) - return (-1); + return (1); return (mbscoll(lp1->fields[fieldno1], lp2->fields[fieldno2])); } From nobody Wed Jan 24 10:06:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKfkv4jJ8z57xLJ; Wed, 24 Jan 2024 10:07:03 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKfkv2ZQzz46Zl; Wed, 24 Jan 2024 10:07:03 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Date: Wed, 24 Jan 2024 11:06:34 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1706090820; bh=wy+KS0UiUiz4P97a8O1Birnrz6rg3D1nG3qhiUPlqQU=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=ctTNEWclz/gnrPF786MyO3jvx8/MCtSgKi9FARkeka7xu67t1a/bj1RcITimh+fjg MOph2BdMMmc8xCRbL176ZJe305WOyenEPoRbDYH3q3r5+XiPz1yv/Fh5GQXzQVLkp2 qHGbROTdL96Bn1z7usWZNJIrnM9pBDboZVvR3g04DuJHBuKxObWLh6ZuQylMhAWwVG JJPNwQXYqhrRe2tjHHF9AhZuhZk2WF5oWyBpEkaASDwql/25ZtZM+N9HrjoDkua40t 7DJ90gno0O7OH2YTvQB8ccawADuaIawGAWSJKHRmMz9bFH971QpspoK5MJ0IsRjU7t sXdPNxxkbQryA== Message-ID: <87sf2nm4et.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Kristof Provost Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 54c62e3e5d8c - main - pf: work around icmp6 packet-too-big not being sent when binat-ing In-Reply-To: <1E1C3472-0AF3-457B-A27A-89679770EA62@FreeBSD.org> References: <202401221252.40MCqpf6047526@gitrepo.freebsd.org> <87v87jkii9.wl-herbert@gojira.at> <1E1C3472-0AF3-457B-A27A-89679770EA62@FreeBSD.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/29.2 Mule/6.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4TKfkv2ZQzz46Zl X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE] On Tue, 23 Jan 2024 19:42:10 +0100, Kristof Provost wrote: > > On 23 Jan 2024, at 19:32, Herbert J. Skuhra wrote: > > On Mon, 22 Jan 2024 13:52:51 +0100, Kristof Provost wrote: > >> > >> The branch main has been updated by kp: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=54c62e3e5d8cd90c5571a1d4c8c5f062d580480e > >> > >> commit 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e > >> Author: Kristof Provost > >> AuthorDate: 2024-01-17 17:11:27 +0000 > >> Commit: Kristof Provost > >> CommitDate: 2024-01-22 11:52:14 +0000 > >> > >> pf: work around icmp6 packet-too-big not being sent when binat-ing > >> > >> If we're applying NPTv6 we pass a packet with a modified source and/or > >> destination address to the network stack. > >> > >> If that packet then turns out to be larger than the MTU of the sending > >> interface the stack will attempt to generate an icmp6 packet-too-big > >> error, but may fail to look up the appropriate source address for that > >> error message. Even if it does, pf would still have to undo the binat > >> operation inside the icmp6 packet so the sending host can make sense of > >> the error. > >> > >> We can avoid both problems entirely by having pf also perform the MTU > >> check (taking the potential refragmentation into account), and > >> generating the icmp6 error directly in pf. > >> > >> See also: https://redmine.pfsense.org/issues/14290 > >> Sponsored by: Rubicon Communications, LLC ("Netgate") > >> Differential Revision: https://reviews.freebsd.org/D43499 > >> --- > >> sys/net/pfvar.h | 1 + > >> sys/netpfil/pf/pf.c | 12 ++++++++++++ > >> sys/netpfil/pf/pf_norm.c | 15 +++++++++++++++ > >> 3 files changed, 28 insertions(+) > > > > Does this change cause problems for others too? > > > > - ssh over IPv6 permanently disconnecting > > (client_loop: send disconnect: Broken pipe) > > - ssh connections over IPv6 hanging > > - git pull not working > > Fssh_ssh_dispatch_run_fatal: Connection to 2604:1380:4091:a001::24ca:1 port 22: Permission denied > > fatal: Could not read from remote repository. > > > Can you include your pf.conf and a packet capture demonstrating one of these issues? So I assume this issue affects only me or this server (igb nic). Disabling tso6 seems to resolve the issue. I also have an issue with rack enabled. I only works with lro disabled or net.inet.tcp.rack.features.cmpack=0. I'll check pf.conf and packet capture later. Thanks. -- Herbert From nobody Wed Jan 24 10:16:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKfy93RNgz57y7v; Wed, 24 Jan 2024 10:16:49 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKfy9022tz472q; Wed, 24 Jan 2024 10:16:49 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:e94b:5726:154f:104e]) (Authenticated sender: micmac) by drew.franken.de (Postfix) with ESMTPSA id E6F85721E280D; Wed, 24 Jan 2024 11:16:43 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.400.31\)) Subject: Re: git: 54c62e3e5d8c - main - pf: work around icmp6 packet-too-big not being sent when binat-ing From: tuexen@freebsd.org In-Reply-To: <87sf2nm4et.wl-herbert@gojira.at> Date: Wed, 24 Jan 2024 11:16:43 +0100 Cc: Kristof Provost , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <413C7C6F-8B6F-4EAD-8EF7-7C9245BE78BF@freebsd.org> References: <202401221252.40MCqpf6047526@gitrepo.freebsd.org> <87v87jkii9.wl-herbert@gojira.at> <1E1C3472-0AF3-457B-A27A-89679770EA62@FreeBSD.org> <87sf2nm4et.wl-herbert@gojira.at> To: "Herbert J. Skuhra" X-Mailer: Apple Mail (2.3774.400.31) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4TKfy9022tz472q X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE] > On Jan 24, 2024, at 11:06, Herbert J. Skuhra = wrote: >=20 > On Tue, 23 Jan 2024 19:42:10 +0100, Kristof Provost wrote: >>=20 >> On 23 Jan 2024, at 19:32, Herbert J. Skuhra wrote: >>> On Mon, 22 Jan 2024 13:52:51 +0100, Kristof Provost wrote: >>>>=20 >>>> The branch main has been updated by kp: >>>>=20 >>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D54c62e3e5d8cd90c5571a1d4c8c5f062= d580480e >>>>=20 >>>> commit 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e >>>> Author: Kristof Provost >>>> AuthorDate: 2024-01-17 17:11:27 +0000 >>>> Commit: Kristof Provost >>>> CommitDate: 2024-01-22 11:52:14 +0000 >>>>=20 >>>> pf: work around icmp6 packet-too-big not being sent when = binat-ing >>>>=20 >>>> If we're applying NPTv6 we pass a packet with a modified source = and/or >>>> destination address to the network stack. >>>>=20 >>>> If that packet then turns out to be larger than the MTU of the = sending >>>> interface the stack will attempt to generate an icmp6 = packet-too-big >>>> error, but may fail to look up the appropriate source address for = that >>>> error message. Even if it does, pf would still have to undo the = binat >>>> operation inside the icmp6 packet so the sending host can make = sense of >>>> the error. >>>>=20 >>>> We can avoid both problems entirely by having pf also perform the = MTU >>>> check (taking the potential refragmentation into account), and >>>> generating the icmp6 error directly in pf. >>>>=20 >>>> See also: https://redmine.pfsense.org/issues/14290 >>>> Sponsored by: Rubicon Communications, LLC ("Netgate") >>>> Differential Revision: https://reviews.freebsd.org/D43499 >>>> --- >>>> sys/net/pfvar.h | 1 + >>>> sys/netpfil/pf/pf.c | 12 ++++++++++++ >>>> sys/netpfil/pf/pf_norm.c | 15 +++++++++++++++ >>>> 3 files changed, 28 insertions(+) >>>=20 >>> Does this change cause problems for others too? >>>=20 >>> - ssh over IPv6 permanently disconnecting >>> (client_loop: send disconnect: Broken pipe) >>> - ssh connections over IPv6 hanging >>> - git pull not working >>> Fssh_ssh_dispatch_run_fatal: Connection to = 2604:1380:4091:a001::24ca:1 port 22: Permission denied >>> fatal: Could not read from remote repository. >>>=20 >> Can you include your pf.conf and a packet capture demonstrating one = of these issues? >=20 > So I assume this issue affects only me or this server (igb nic).=20 > Disabling tso6 seems to resolve the issue. >=20 > I also have an issue with rack enabled. I only works with lro disabled > or net.inet.tcp.rack.features.cmpack=3D0. I think I know what the issue is (some hooks are not called when in the = compressed ack code path), some dtrace probes are also affected. I'm working on a fix for that. Best regards Michael >=20 > I'll check pf.conf and packet capture later. >=20 > Thanks. >=20 > -- > Herbert From nobody Wed Jan 24 11:38:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKhmq6lmKz5867Q for ; Wed, 24 Jan 2024 11:38: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 4TKhmq5qXwz4Kjf; Wed, 24 Jan 2024 11:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706096331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RpmR1Kscs7vGisPoDSG9Uupb2Ug1xNOeoTj982hEQR4=; b=qSwivB4FiPKT9KXFHjG83wKHkpJlRLHoQvrnRo1c56qWPOCiis+3uaupXkvqxOhGy/sbwg iHt7DVVeTjQEaPCoZPCHam85XTuKeSklitRHgGfbcuhpLXvqbprlPe/DkXsTGZUoHs2BF4 fSyVFk61s0+kuC1qJl4TgBRn9oRYFQTUcJcGkZayPxr1iA5NGr3ncAL2LHsv/meYT/gYLe A+R8CtmzFreBb70taqotFszEffbSh5UlXnEtzfLm9rIo0bQUXF8u2uVNMg7yV8siOvx7Hj +VoZcAEWbq/priwWCMGdfilb/WeLyulsb7ZaWBBQvAgFqg33UNz3Q5rz9V/eOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706096331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RpmR1Kscs7vGisPoDSG9Uupb2Ug1xNOeoTj982hEQR4=; b=sstjvcuZT2qrGszLuweb47sIfUF2BKaazFPN/1fuUv5xuNSmDUvezZUU1l9ajKAB1ZdsIN pp7vc5Aiw8XHBqy5949FU/AaOEqtt3S4IxVYFDa2qKd9j1kq9MSMdCNklQUktKVsWEqMrh m63kjXVBciAMblSxb+kHVNkaKD5jN/m078gp6C2iZPwrxdd+sUGp0TJGIz8Mhj4AyHSUt/ scpqQ07wJI25fyOJPeZ1ob7EzUYXsz7DhNMgqyzVH46E4XneUQ1q7ocaIUiS0eYh5TMR97 Z4vOHAzDXM1epP2fkOai6yMPAyz8Ma4mb5b6S48Jjkf6mxVw9TVIuQuQomxjBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706096331; a=rsa-sha256; cv=none; b=dkJaLwrB9mtfs+RuxnfAwBDOHCNGkOsZyUEKKJ0RgZ7tijj79Biy3EqeejSW5kk0v0v37r K7rG3x7bg/ex16FXxG1aqwsVjXxka0E+GK0OvFOdGZ/f8h/5/glfiSoTfksWlr1rkqUcwC 3pqMJvsvm0Ry6wLh7Q4cIP/ihlN8SJC30/UD7wS+5J7cioBOI2LMsOQixufYIdHriJdgq6 mRKfWAglHPhke/SUedukTW9842f6E8gHf9ovsP+6mIoQl1RjVE+H4P96gWF68hiBcAhY72 Ma7AnzxlRZ78m/E8ZW5l+BEHNmVg7YzCV3FjSoIvGUzIYvj78pylOWyEyUPeDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKhmq4Jrgz1CF4; Wed, 24 Jan 2024 11:38: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 40OBcpGv081196; Wed, 24 Jan 2024 11:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OBcpSX081195; Wed, 24 Jan 2024 11:38:51 GMT (envelope-from git) Date: Wed, 24 Jan 2024 11:38:51 GMT Message-Id: <202401241138.40OBcpSX081195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: a0b2a93c41b0..a4bf6baaeb70 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: a4bf6baaeb70a01a4c13fd6139ebdc97bad172e9 X-Git-Oldrev: a0b2a93c41b0b0d7723d1b20eb1eca7a1a63e45b X-Git-Newrev: a4bf6baaeb70a01a4c13fd6139ebdc97bad172e9 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=a0b2a93c41b0..a4bf6baaeb70 d9cb42da999e FreeBSD: Fix bootstrapping tools under Linux/musl 435b173fd972 ZTS: Apply zfs_bclone_enabled to bclone tests a4bf6baaeb70 Fix file descriptor leak on pool import. From nobody Wed Jan 24 11:42:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKhrl1J7Zz586Cn; Wed, 24 Jan 2024 11:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKhrl0FSfz4LZF; Wed, 24 Jan 2024 11:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706096535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y39kBpdhLkSIi2i97VJnBzaKiZPR3Gruix+vuztRHR8=; b=SsjGQy3YySgLRN1yN9RpL0Rpz4OPHc+qXCHpnstKk3XP9X0KoQ/M1g6TT2XAElI4RwekxY oTilLSnZdov37aszwYCRWp2QpaNBuVcIGaeZFHMKDIQZRfgao/f+VC9BHe6QDQAsoh9DzL rJA4c5XIeqk6loZvMdiJFEBqrsfoF7QFioclqJtV3DOXh5wtFf6SRhRmACI7VPmLLdI0u8 YtHraNuZuYvbBF1eYpvtXoV20WqOeOYcfvqf9++4ectOuLGa2Hptvd4vOYv/1fPvBLPhrY npM6oWXLvQG5KjcEthVNKBdcbjcLCnPkBIdIcjplD95T+MMbD2OPIMPOpx48ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706096535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y39kBpdhLkSIi2i97VJnBzaKiZPR3Gruix+vuztRHR8=; b=nFRme+b5t3RI8HO9PT6PT0yxnZspKW1S9fnT+nugdDfayK62g5PvlMlUJBsmyFcpRzcTpP 7ll7woqGA2HD90A5cOThnSqqzbCzRf5ls2vruY7srz4omwM+H1/Cisvyvc0FZgF2zxH7Hz KHmc+BXMlCrpEcDFELsiN5qyD/2Ta1MVoIguMLWn51aFJjswu+SuO8tzpFKbHQwM8r8zAf jHzqwO46SnbXYR5MrU9fFbrhCR8cKZNAyEqvkhUyXm+3dAZkcp2eJtCxGg+wuwiED3Onlw DOpATjOFDm/Vn5BKGz2F8lgagA1okjNVXwpZllwvDhLHyGFQ2LfW62ykZKcWug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706096535; a=rsa-sha256; cv=none; b=aBWT+DK5FMtBS4epBnYJP6wLofC8g9srCX43rm9C3qufaqNGxQLrfRf5BheuWNCQ68Clnf 4fkf9CuEc1xIMwaFm2rM55YkFdb8m4QR5gO90MvUwOOtu+hYV7yzD6ABX1k8jyy9MMaxdq bpMQHC3KWN2JWPsffAUS7v0939RD6IndyxSHXT3yjc2ZZ2mIuZnsCeZfdfmEadLQs5Nid/ a9TTK4WgueBM9BS87Fqkwm7jbkt5CgWu6+okZdjWxEw4NkC/A+sfGW5HY+qDDgsGK8UaOQ 3ZSxJwMjh9FQthWtpVdOrAsTlIEE+7BPgxuDtk7+wVUJFf8b7gwj5amLf4HLzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKhrk6QXNz1Bt2; Wed, 24 Jan 2024 11:42: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 40OBgELW095834; Wed, 24 Jan 2024 11:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OBgC6M095825; Wed, 24 Jan 2024 11:42:12 GMT (envelope-from git) Date: Wed, 24 Jan 2024 11:42:12 GMT Message-Id: <202401241142.40OBgC6M095825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: fedf5b965fd6 - main - zfs: merge openzfs/zfs@a4bf6baae List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fedf5b965fd623957a9b851418ba3301ac122e27 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=fedf5b965fd623957a9b851418ba3301ac122e27 commit fedf5b965fd623957a9b851418ba3301ac122e27 Merge: 95bf75895ddc a4bf6baaeb70 Author: Martin Matuska AuthorDate: 2024-01-24 11:41:22 +0000 Commit: Martin Matuska CommitDate: 2024-01-24 11:41:51 +0000 zfs: merge openzfs/zfs@a4bf6baae Notable upstream pull request merges: #15630 a4bf6baae FreeBSD: Fix file descriptor leak on pool import #15780 d9cb42da9 FreeBSD: Fix bootstrapping tools under Linux/musl Obtained from: OpenZFS OpenZFS commit: a4bf6baaeb70a01a4c13fd6139ebdc97bad172e9 .../lib/libspl/include/os/freebsd/sys/stat.h | 6 ++- .../openzfs/module/os/freebsd/zfs/zfs_file_os.c | 63 +++++++++++++++++----- .../zfs-tests/tests/functional/bclone/cleanup.ksh | 9 +++- .../zfs-tests/tests/functional/bclone/setup.ksh | 5 ++ sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 6 files changed, 72 insertions(+), 17 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index 70eea47ba127,000000000000..f248e896babb mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1176 -1,0 +1,1176 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* Define to 1 if you have the `execvpe' function. */ +/* #undef HAVE_EXECVPE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* user_namespace->ns.inum exists */ +/* #undef HAVE_USER_NS_COMMON_INUM */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->copy_file_range() is available */ +/* #undef HAVE_VFS_COPY_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* file_operations_extend takes .copy_file_range() and .clone_file_range() */ +/* #undef HAVE_VFS_FILE_OPERATIONS_EXTEND */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* All required iov_iter interfaces are available */ +/* #undef HAVE_VFS_IOV_ITER */ + *** 233 LINES SKIPPED *** From nobody Wed Jan 24 12:05:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKjMT6JMrz58814; Wed, 24 Jan 2024 12:05: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 4TKjMT5nTsz4NwD; Wed, 24 Jan 2024 12:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706097925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHocrKvq6D+K1dhdeYlcmEOqnk6UVJsnK8JtpP6nENA=; b=dpxQO3IRHCIf7hnhtY+aEm/Mi6X3LoFSeBq3RBs7Fz7itaRTMkn0HSbWltKcQR2Y+QXxvj jqLeiHKB2fazjWYGn7rP/ugLr/NWTRg7sGQbHG2n+grArxmPaLnwdZJRmG0uR9uYFsCAm3 /DXCCJbqN3C22VQLLkXTocPir6NgzyRGfHcskgLpy2FyQF07s68KC9c3DL1EhI6Yz8p8RX KojztUuklfyj0ikO2M9s5Zgy1t5eI2yyFcMQg3uI/vDWdc53U+Ad7j0XQr3m/PknV0YvNg KTN+QnMJc+7/9rpSnybqhwBvud6LmZoPgU3SUsV8E6yR5WUySndqaOCd0a22+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706097925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MHocrKvq6D+K1dhdeYlcmEOqnk6UVJsnK8JtpP6nENA=; b=OA/qBqNKHloMxJ7CXpDgzNcWqu2cdYvkxMjkGbQn4jwDAFtxqnp1sHr19Q8uZM2A/xYfQT m59xI30uydMuM2Bj+hEyuojt0HFtipUosTCi4fdQHg9I1+cpbGP9QddAKUYNhq5FAdWq87 +4OPU2Gr8xzC48taqpcdsu+P/66viJ+kmzp+bLjzWCgwu0HMsE26AYb1Z5mpFGww+0vVj/ duoUj/joudMCj15dxoRjXhYBB3yipauhok+xocvr2wJ9yAklz5jH0Davl2OC+hajs4E7jR w6J3CCjHREBHug40Z0Ci6yq7Yx6IzSoD627GHQ3mZD5g0Eg7RpoeYSsz6QZVDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706097925; a=rsa-sha256; cv=none; b=eWY6zk3w6XJBNnJ8PhtKJggCc7F/7ZGC23BI4x5gJEqeXtsO4SN84HEecluSrpsivq59KP ndzcrL07uNYhlbklJy97Bnu6jzens6X8D8pH2c0MUT6bB/VcGE8LSctRdFH69cN6j+wODw l1Es8NOJTqVqil0x39p6TvU3PWCyoFRA6lm2C8x1g9WBWDp36lbl/b0wUnGiykhwFYxHEX L6WvL2z3zHFDuH9voiUHM8zzo/XKNpKZnql+KJA+5JL8uknoV8U/cTdb4oSX3eFYDSYg1G x1++hir/xZBnZP3p+LiNanpl6DPBfd7G3SU78yj8J1Jjm0x1SKcweCfpzyVBJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKjMT4rwMzDgn; Wed, 24 Jan 2024 12:05: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 40OC5O3u032255; Wed, 24 Jan 2024 12:05:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OC5OFr032252; Wed, 24 Jan 2024 12:05:24 GMT (envelope-from git) Date: Wed, 24 Jan 2024 12:05:24 GMT Message-Id: <202401241205.40OC5OFr032252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Yoshihiro Takahashi Subject: git: dd5dabe28483 - stable/14 - periodic: Fix periodic reports when log files are not compressed. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nyan X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dd5dabe284831a40bb8ef4749b352c03bf9f4a44 Auto-Submitted: auto-generated The branch stable/14 has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=dd5dabe284831a40bb8ef4749b352c03bf9f4a44 commit dd5dabe284831a40bb8ef4749b352c03bf9f4a44 Author: Yoshihiro Takahashi AuthorDate: 2024-01-10 11:48:56 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-01-24 12:04:50 +0000 periodic: Fix periodic reports when log files are not compressed. The modern zcat(1) is capable of handling compressed and uncompressed text files, so we can simply use zcat command. PR: 253168 Reviewed by: delphij MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43357 (cherry picked from commit 1fa4ddcc6de6a0c46416f719a5b7efa1169f51ce) --- usr.sbin/periodic/etc/security/800.loginfail | 7 +------ usr.sbin/periodic/etc/security/900.tcpwrap | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index 4329728f9505..c5a3a972aaa1 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -49,12 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - *.xz) xzcat -f $f;; - *.zst) zstdcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/auth.log ] && cat $LOG/auth.log } diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap index ae081ded6a95..55fa58f4df39 100755 --- a/usr.sbin/periodic/etc/security/900.tcpwrap +++ b/usr.sbin/periodic/etc/security/900.tcpwrap @@ -49,12 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - *.xz) xzcat -f $f;; - *.zst) zstdcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/messages ] && cat $LOG/messages } From nobody Wed Jan 24 12:09:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKjSb52Ghz588MM; Wed, 24 Jan 2024 12:09: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 4TKjSb47CTz4P9k; Wed, 24 Jan 2024 12:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706098191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9S1mn+jl0WBGaiss+T2Aq6XBCzZUdbRhbeQEkEDtLY=; b=IB6mDLrynrQATdcKWlpbs85B39F3+qKtr+VzAYaBXeXzDqQoYp8Xsq0gUMfgBQGoYdqDzZ 1RRLWlTeoVxnLNdxbYyIq3YO3IDRWLfUDXLDl9mOnEKA0cl88NdXG2bTld/DhbYaYEvlIn p/UISAsXXjtYFqcWPeMhRnOpmqEeFcyMkKz4wPRpb4dHMth2xLMpVHJ/fYLkY+mpmbB/W3 gqJWwjfBRzPEZpjP2NEfhM9zcRDyAKUnYkRbTtqGMIldNi6blBG+ban2CChGHcfmDz4FrS S2C52jGdVyuUld5QZiGLaIWeGq4iOXjumemz3GQ6eyM6N//qAGJHwn8MqhwEfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706098191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9S1mn+jl0WBGaiss+T2Aq6XBCzZUdbRhbeQEkEDtLY=; b=J3Bn+wlklf4g0x+SfUhTIleZekHdj+cWcEG8/s6gcz7WmIEKNV8Exl4CyOXNRgDHKJZmeM QpgNnmUujgmnEHo9p/8Lf4peygETUBBe96TW7BtVLr/yDdZbvQqyoTSx1R7xoVH483Bp0P MbTmBPig2t/MhabUPF/QSXcMICLK45KzvAlg0n6zfV38GuWkEU6XMf3wPZ0Yvn26y5aFFr ksscRfPJ2tXrue9oa86goMn/FPnaa0b4jT5U0X/eQAZjSPzPVNCrMpt1Q6O0p0+vqc/48p YwdvsmILJejEGaz11+iV6zK7XzPQQ8/dY+TJuaobqcKqXAqXLgqqRakkOY963w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706098191; a=rsa-sha256; cv=none; b=iJCIiG0TtgaRRjLL6wbojO32AkCRqE1Yq8TmFXG9SMdZXO3dOQPKA3U0DQ2hAoO2BJm6xD 1jTprbRWZysnfA1c5Tng4QnLKBmn11U1hyT1MgFtCB4uwo24yd6K8SwBBJGRuNCPQclr1X DWwvenourxd13e7FkU9uP3N7Dw/ngdWJegKCji8hLuo0DggJhf5biPot1rUacUYNZbjOFS jDnazDesbXDEOoT2uf3KhS8VgnrtCQKbbVJJ/nLzGq7ortVk7S0K3DPGm28Jk2D+OB2GyJ 1ZhGuPG2soBfnpUc5SUwWhBNfu7CNeatL0+wXNw3zSCuPBPaHiC3lJK4P00PcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKjSb3BFtz1CGh; Wed, 24 Jan 2024 12:09: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 40OC9p4f032979; Wed, 24 Jan 2024 12:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OC9pxY032976; Wed, 24 Jan 2024 12:09:51 GMT (envelope-from git) Date: Wed, 24 Jan 2024 12:09:51 GMT Message-Id: <202401241209.40OC9pxY032976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Yoshihiro Takahashi Subject: git: f148fbe15373 - stable/13 - periodic: Fix periodic reports when log files are not compressed. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nyan X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f148fbe153738776c0e2263754e38cf7e0beb63e Auto-Submitted: auto-generated The branch stable/13 has been updated by nyan: URL: https://cgit.FreeBSD.org/src/commit/?id=f148fbe153738776c0e2263754e38cf7e0beb63e commit f148fbe153738776c0e2263754e38cf7e0beb63e Author: Yoshihiro Takahashi AuthorDate: 2024-01-10 11:48:56 +0000 Commit: Yoshihiro Takahashi CommitDate: 2024-01-24 12:08:58 +0000 periodic: Fix periodic reports when log files are not compressed. The modern zcat(1) is capable of handling compressed and uncompressed text files, so we can simply use zcat command. PR: 253168 Reviewed by: delphij MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43357 (cherry picked from commit 1fa4ddcc6de6a0c46416f719a5b7efa1169f51ce) --- usr.sbin/periodic/etc/security/800.loginfail | 5 +---- usr.sbin/periodic/etc/security/900.tcpwrap | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.sbin/periodic/etc/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail index 713f4fed47bf..c5a3a972aaa1 100755 --- a/usr.sbin/periodic/etc/security/800.loginfail +++ b/usr.sbin/periodic/etc/security/800.loginfail @@ -49,10 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/auth.log ] && cat $LOG/auth.log } diff --git a/usr.sbin/periodic/etc/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap index 132bc9865b18..55fa58f4df39 100755 --- a/usr.sbin/periodic/etc/security/900.tcpwrap +++ b/usr.sbin/periodic/etc/security/900.tcpwrap @@ -49,10 +49,7 @@ catmsgs() { sort -t. -r -n -k 2,2 | while read f do - case $f in - *.gz) zcat -f $f;; - *.bz2) bzcat -f $f;; - esac + zcat -f $f done [ -f ${LOG}/messages ] && cat $LOG/messages } From nobody Wed Jan 24 12:36:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKk3p2M9Yz58BNH; Wed, 24 Jan 2024 12:36: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 4TKk3p1v3Vz4Sk0; Wed, 24 Jan 2024 12:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706099814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOZ8H2zqwX4PgKoUm/gMkNiPWBGwqcm+aG6JkZ0xVhM=; b=MuydyEq3OM4sgZPlb8sw7CK3sg6PTwGoXA7LKvE1zzxIkFxUBOtBfjvg4w7Lzye3fhsHl/ b1o7SrlOhvJ7gUlB8JtlvbE2T1rdin1KYBpLMX5drPDB4U4+5CYYkEUhTsRbZYhNbsgA3I DE/4nFyxwr1/0T8itXMoXzffssjLJJuQITielvSh2Q9cmbgU7t0RwFE7Xno8YE/+kqGsWP B9QtsrKtt5r1ssNRtLqXvxlg9A8qXfQ1tYsv6j6UUZpEQ+5q5oELcL8RAj0yPyaccAkk0Y YAnkCUtGCHKnCLNYFTR39EKCEaQ5PF61nJXcWGo1cD6fQoWJ5aFCT1PldccqmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706099814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pOZ8H2zqwX4PgKoUm/gMkNiPWBGwqcm+aG6JkZ0xVhM=; b=n2s7VsOzxEGqxdBITCBC+f4MTi36HlmGkcEFtpx89kYgzBZKEbyBgqGxl/BNvRYk2VGNcb d6gkTMvdMZjHwFRSp00zLy8hOuYvYHZsvNwM8h31gh2nzfA62kwMGE0pJFsOf6+2VzCYSy V/niAsUIzoHOW9wxYYt3ry59Cjt7B8SqvOihT+wDyGGzGrBY9Zcf7MKV+YEWvHe6pvjonm AmfNIcaT5pLJ+605M1pCiA6GZ/jwACjDcgSENZ9ArDssY1ha19m4U6ioQQlu+LwUtRkuKM ONZOkE159UlIsDdzySQ5zZ9P6mZSJEIvUI5BrOk1o0VCEh3hxpC5XRrbv0ORUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706099814; a=rsa-sha256; cv=none; b=tZX6GUgRbvJzbBVMErd/Y/hNdW90WVnRcgqrJEBKeaI2eaJvk+83dImWiWS2JWDDxCRkG9 bbT+EyJ3Q2HtE8Gxkk+Teh0+72UbYMEdU0VQKWUA7wGYaAL4AZ0qC8E/DHiOF3gGS+Zfh5 KOS5tq2KmbmVx6UGymzEA9LeCW0fYo3KpIkGgel6j4BbOP+y0bnuNP2QCzdTDDwletSGAn K9cAXyIZn66VkJ/DX6LFf0ZSVyvwEN9EQEoTVoyZs9w7HDadb0gG3OywBmvGE6oib3a/Lt iOB5piz69IpdTnoZFRMlbuI3ADs/CT9vLIf1312A/9FuXMtKBUeUO3oVJX83Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKk3p0yJlzF85; Wed, 24 Jan 2024 12:36:54 +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 40OCasMb082051; Wed, 24 Jan 2024 12:36:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OCasuj082048; Wed, 24 Jan 2024 12:36:54 GMT (envelope-from git) Date: Wed, 24 Jan 2024 12:36:54 GMT Message-Id: <202401241236.40OCasuj082048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 33cd6211052c - stable/14 - mana: Fix TX CQE error handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 33cd6211052c5add833150b2eff1bc0729651d3a Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=33cd6211052c5add833150b2eff1bc0729651d3a commit 33cd6211052c5add833150b2eff1bc0729651d3a Author: Wei Hu AuthorDate: 2024-01-17 09:19:35 +0000 Commit: Wei Hu CommitDate: 2024-01-24 12:36:13 +0000 mana: Fix TX CQE error handling For an unknown TX CQE error type (probably from a newer hardware), still free the mbuf, update the queue tail, etc., otherwise the accounting will be wrong. Also, TX errors can be triggered by injecting corrupted packets, so replace the mana_err to mana_dbg logging. Reported by: NetApp MFC after: 1 week Sponsored by: Microsoft (cherry picked from commit 516b5059705b6b8bbba28821dbe05964c128f9a9) --- sys/dev/mana/mana.h | 2 ++ sys/dev/mana/mana_en.c | 14 ++++++++------ sys/dev/mana/mana_sysctl.c | 6 ++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index ab394f3203ad..906b28eb56b6 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -137,6 +137,8 @@ struct mana_stats { counter_u64_t mbuf_alloc_fail; /* rx */ counter_u64_t alt_chg; /* tx */ counter_u64_t alt_reset; /* tx */ + counter_u64_t cqe_err; /* tx */ + counter_u64_t cqe_unknown_type; /* tx */ }; struct mana_txq { diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 812a42e51dfc..09de49a11010 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -1487,21 +1487,23 @@ mana_poll_tx_cq(struct mana_cq *cq) case CQE_TX_VPORT_DISABLED: case CQE_TX_VLAN_TAGGING_VIOLATION: sa_drop ++; - mana_err(NULL, + mana_dbg(NULL, "TX: txq %d CQE error %d, ntc = %d, " "pending sends = %d: err ignored.\n", txq_idx, cqe_oob->cqe_hdr.cqe_type, next_to_complete, txq->pending_sends); + counter_u64_add(txq->stats.cqe_err, 1); break; default: - /* If the CQE type is unexpected, log an error, - * and go through the error path. + /* If the CQE type is unknown, log a debug msg, + * and still free the mbuf, etc. */ - mana_err(NULL, - "ERROR: TX: Unexpected CQE type %d: HW BUG?\n", + mana_dbg(NULL, + "ERROR: TX: Unknown CQE type %d\n", cqe_oob->cqe_hdr.cqe_type); - return; + counter_u64_add(txq->stats.cqe_unknown_type, 1); + break; } if (txq->gdma_txq_id != completions[i].wq_num) { mana_dbg(NULL, diff --git a/sys/dev/mana/mana_sysctl.c b/sys/dev/mana/mana_sysctl.c index d03ebe44ab31..844a05040595 100644 --- a/sys/dev/mana/mana_sysctl.c +++ b/sys/dev/mana/mana_sysctl.c @@ -292,6 +292,12 @@ mana_sysctl_add_queues(struct mana_port_context *apc) SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, "alt_reset", CTLFLAG_RD, &tx_stats->alt_reset, "Reset to self txq"); + SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, + "cqe_err", CTLFLAG_RD, + &tx_stats->cqe_err, "Error CQE count"); + SYSCTL_ADD_COUNTER_U64(ctx, tx_list, OID_AUTO, + "cqe_unknown_type", CTLFLAG_RD, + &tx_stats->cqe_unknown_type, "Unknown CQE count"); /* RX stats */ rx_node = SYSCTL_ADD_NODE(ctx, queue_list, OID_AUTO, From nobody Wed Jan 24 13:04:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKkgY6Zj8z58DCq; Wed, 24 Jan 2024 13:04: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 4TKkgY65Lfz4W7y; Wed, 24 Jan 2024 13:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706101465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXarlPDbG12rBEBJvJxExANZKtdcPMQZjFoa+JNZ6Yk=; b=sWXO77yqDPbHJQwppLcprnal88wrauttW9eT711nfp8x20kBzL7zGsl64EUaB5iIsz5wIR H4aOiitlYMLISJblAiUS9AEa3vPptMyeRwVmS9uFyDbW4+Yg8wq5vUhVth+P24MVNnq+Iv YI9QsiLChgnoO8E0UD1ATSmypYuMSWJUo1IOa3HqF6wFAYAE0yL6U7ZmSZ5oCuagaaKLcC MFtnQm3G+dUcgZ3rSDg1jcwM0hL0vHjbLjvHZXxENCRr/wZvEXx73+F3uauNYIse34gTOk JNJDYrWg2ihUnqeAftOwEwRHfxvi6lBIRrk7MtSGgOGjRNAAYkOcVKL0CUwvOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706101465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXarlPDbG12rBEBJvJxExANZKtdcPMQZjFoa+JNZ6Yk=; b=pPNFkNwR9JIQeGRA0FcRt0ek4Se2TRksokR9HewX1MyiKzl1+x7PLVJADfalHMBnKE+J+U hKJ/jyNyz3DqCpqPPIebHGG+VdP8m9uab/YlU8TBRKsG+Y3i0k907zuRat9JuAH5++DjM2 lI2TZGS66oUFAv2GN3m96S5x+RBa7uHKk4V1biw+wfvv9tuvax+xjuRlupuyuCWrU7wGSQ 0gPYfTX1jLTbLo3JA1QTQ3kdWwYEfDxlzQHL9E0LvfsOJfuk1egA7I+axt9i1x8LA1jDro bGZX4F+dtvwFr5AVAIcpsZh+fCfMnSO+qAv3eWgKyZUGBaOseHBLB7xYdFsM2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706101465; a=rsa-sha256; cv=none; b=DRoYf4laVJn9jiMaOCucQnV8DuxDKAf92ApyHfhJ8hXyoKN+o8miLL4qyy7yZ0SOQDEeno tKalm+gRIE3hYaKPtCWA41gjwogkMnpo+odBMDHNzCNeJwFfcgMzwdvrYryOM26vYY9Koi dc2ZWjsqaTUFZqCVNmwiBwW03JP8SYkk+n4PSuFlsZIjX1tQu2SNC41lPXpXYQVP8fliAv DCqLhBju9siq+FLKf/qfrLdgeCVYuqFMPAc74IFM1cleF+8TwqmRvg3SmlZeBOXbhVsAKw IXDoU65mhaI4EPu/8dgAmV9Byn3/FtopVsfxFijvim6cUgHzyxNWIRpx27761Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKkgY57R6zFRr; Wed, 24 Jan 2024 13:04: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 40OD4PMo032829; Wed, 24 Jan 2024 13:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OD4P7u032827; Wed, 24 Jan 2024 13:04:25 GMT (envelope-from git) Date: Wed, 24 Jan 2024 13:04:25 GMT Message-Id: <202401241304.40OD4P7u032827@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: 8788c3d3fa9d - stable/14 - sysctl vm.objects/vm.swap_objects: do not fill vnode info if jailed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 8788c3d3fa9d217e0b4f2bb87a84fbd6e6aceac9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8788c3d3fa9d217e0b4f2bb87a84fbd6e6aceac9 commit 8788c3d3fa9d217e0b4f2bb87a84fbd6e6aceac9 Author: Konstantin Belousov AuthorDate: 2024-01-13 01:46:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:07 +0000 sysctl vm.objects/vm.swap_objects: do not fill vnode info if jailed (cherry picked from commit 38f5f2a4af5daeec7f13d39cad1ff4dc90da52d8) --- sys/vm/vm_object.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index d3337c038113..76ae6118a756 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -2516,6 +2517,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) vm_page_t m; u_long sp; int count, error; + bool want_path; if (req->oldptr == NULL) { /* @@ -2534,6 +2536,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) count * 11 / 10)); } + want_path = !(swap_only || jailed(curthread->td_ucred)); kvo = malloc(sizeof(*kvo), M_TEMP, M_WAITOK | M_ZERO); error = 0; @@ -2585,7 +2588,8 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) freepath = NULL; fullpath = ""; vp = NULL; - kvo->kvo_type = vm_object_kvme_type(obj, swap_only ? NULL : &vp); + kvo->kvo_type = vm_object_kvme_type(obj, want_path ? &vp : + NULL); if (vp != NULL) { vref(vp); } else if ((obj->flags & OBJ_ANON) != 0) { From nobody Wed Jan 24 13:05:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKkhQ1X10z58Dfh; Wed, 24 Jan 2024 13:05: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 4TKkhQ0v9Cz4WdX; Wed, 24 Jan 2024 13:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706101510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xvHs4kPfN/R4BKg6u/Mh5GoPGcpoxjALJSpEZef9yY0=; b=QQdmw1I1oKoHDJQ7QC05F6cSTh3Z7bfZ2aE6uS9CeC4PIwRdbgnkRz6AAZKEWvkbSDWsGP up5Vq4DOMhYTYyEV+iO8ECt8dHSzukWFDH41YjOhkzpv8E1iWnnmuQAVu3MsXeN7VKMkrx kQRahnpnZ4NKS7aaYTUxgflmnWWYy00ucnd2a7s89rQhaq3OpsUiYxjwzYqYp3NxVG45G8 YwdlNOCxS1U6mq2zaucMbescU4p1f0iPIfearX29ABcplFjDoB9QONEFE3nTkt64BUMaDC 5zVQrCdfcmqDX5gw8IBqlowHE3xcxN589uVtQXheDFj/IeXZ53u0HBx1hBDT0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706101510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xvHs4kPfN/R4BKg6u/Mh5GoPGcpoxjALJSpEZef9yY0=; b=CNvgTZmG8NvXung6siwPvtduXMWMX3CMjlz/sJPes1x0Ojb9Q9/yDXcBm6m+KLtf+HMuF3 cAI9BsC1J3N2T7X5kZKb8rzpjcnXBNtdpBll3ZjLu1LbzD0MDTwtPY0NeLJpxf/MCRjIMK EJEMvbggqgyRPh45DstLQrdgTuncEzrT64ip1kcv2mYeCCgQ0UzQCRC66nwD0D2r36fNal xE9/yYVlmbYGnde6r+tqatJcUoAXCV9FGYuM2TftB1bHB8pKOo1u34a8I/+D1f7dpbc2Fq YKyaIOjGCDOhWIzNa+pZm3uxPaA74y/qBLP0ywra96+4U8UmMFUdlmDVJPKgSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706101510; a=rsa-sha256; cv=none; b=LsXt5aQBkTaPdE8FeeHAqVtbasZ/mamNqhSR4xnA5dbCBqkCgGdrtjjVif1ShfbAx7Tza1 MAd+/lXkRAuUmURrS1POAp4kJU7TXCioK1EtQrsMNVXsq06ihKdHU6YXSqBeQOV4KO8nNh PuLba7+3tXjN+6QWtTCw4PbeG3kboI6lvDKkZdC+Dwf7QP1TOoJEUkDXCzzQOok5kT5PGw iaXgkW55dEdxB9ginw3XhU5pQUTOYzrPBwmjGFJTDpF3WMDPxf1z7B515IR9SX/ymAmyhY lP9PwM1ODcr+6BBiF/XCfVcqM2ngyuol1Ea6xtkZDi/3pYaQdkr38WRcM8sOog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKkhP74SJzG8d; Wed, 24 Jan 2024 13:05: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 40OD59SG033075; Wed, 24 Jan 2024 13:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OD59k2033073; Wed, 24 Jan 2024 13:05:09 GMT (envelope-from git) Date: Wed, 24 Jan 2024 13:05:09 GMT Message-Id: <202401241305.40OD59k2033073@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: 5c4e6fd30bbc - stable/13 - sysctl vm.objects/vm.swap_objects: do not fill vnode info if jailed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 5c4e6fd30bbc859e06af1bdaa42eed32a5418b04 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5c4e6fd30bbc859e06af1bdaa42eed32a5418b04 commit 5c4e6fd30bbc859e06af1bdaa42eed32a5418b04 Author: Konstantin Belousov AuthorDate: 2024-01-13 01:46:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 sysctl vm.objects/vm.swap_objects: do not fill vnode info if jailed (cherry picked from commit 38f5f2a4af5daeec7f13d39cad1ff4dc90da52d8) --- sys/vm/vm_object.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 34d2de1ee875..6da30800896e 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -2559,6 +2560,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) vm_page_t m; u_long sp; int count, error; + bool want_path; if (req->oldptr == NULL) { /* @@ -2577,6 +2579,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) count * 11 / 10)); } + want_path = !(swap_only || jailed(curthread->td_ucred)); kvo = malloc(sizeof(*kvo), M_TEMP, M_WAITOK | M_ZERO); error = 0; @@ -2628,7 +2631,8 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) freepath = NULL; fullpath = ""; vp = NULL; - kvo->kvo_type = vm_object_kvme_type(obj, swap_only ? NULL : &vp); + kvo->kvo_type = vm_object_kvme_type(obj, want_path ? &vp : + NULL); if (vp != NULL) { vref(vp); } else if ((obj->flags & OBJ_ANON) != 0) { From nobody Wed Jan 24 13:27:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKlB26v2lz58GJM; Wed, 24 Jan 2024 13:27:22 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKlB26K7xz4Z86; Wed, 24 Jan 2024 13:27:22 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706102842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vBs9/LnhFF35E+9r6CPKScxbrDKob4NOa5erLXgFL0c=; b=DrloTmUGZ/wNODHtuqCw00/YJ2aDF806NGmVnM3V4VTJhdy2RMmI0TjNy0MyKXFXstP+UG DQVbMsqwlGjr/WTPB7ysYR7vwTTgHJArmObwvvcZnaqNi1L52ZrSM1lmjLBrR1qs7OqSHi OlcX0mNjQE4g7Dw8a/u/P15rGxB7L9QC2J5HGHcYh2pixPfhqVjSylysoebv4V0aT4xuqB UzXpV5QrNDN1IialW5sfy/rYZEumjcCM6qDuCHPsJesjfR61pMdVb1c0yLF1vuO7trnveY 51aEPyDpIfFsjmImw8OLv6lSZ8oh8aMMnh8FyUIr+bgDDXV90KcPs594YSXAhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706102842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vBs9/LnhFF35E+9r6CPKScxbrDKob4NOa5erLXgFL0c=; b=yVbxA0RoFtHC6LDQG4B01TZYvearhoPxGypieBk280fQGe7d3lMpsHOcS09Z3REpnOQZIQ NEZEu0lqGjCkpeHofGzvNYVEAXgdDIc5QEthulDfku+6G7pif9y8H5fGUl4iO25olH6SGJ 9pZKjWOWOu6paLRQUl8piXiB2brYrH4JgZ9Mx74FqkinnVWUIH1357fW+LjzpfBaSvi+S7 vxWchbaHlSa/HeIIe7Mo0mqp/Ej8yH//MLS+0YyteITLWb5SuRPbUnRxFKVbFpkYltk9ho 2DqOkjptG78HiqBcSEOPp6IpeVVtUyAIve65mnjqHmY/JAjDBtAteI3sWoZFUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706102842; a=rsa-sha256; cv=none; b=DzCPEaWSwJzvPkNrkL7QFvbaNBqEDq5p8FNeYTdKPYKx85bP79uUKFpLHyJbkOaF6qJuHb +tPZkhvtV8Cdp2IUU6gEnkAWPk1gj1v6tv2XuBFEVRWgpL+4c8oVjvHeRb8wn6wwyeI70x CDPu3vX5I/FgIXmxUI0sD4nHJ5mKLFOJ+HdTK/F2fneZvRDr6/oWC6zy3cjSB+6fCcnv1f 1v2eYzbTIWK6FMnvMko7/dM5Bz5TlyULgFNjmvy4XYObTgG8vbydAVFkSCW5K95nO+UAsP YBA6khAYup1jM+CGIXMFxthcweTdryAeCv84olOtxA7vG4k0wLSqLoOtLA2ehQ== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TKlB23mKSzXMd; Wed, 24 Jan 2024 13:27:22 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id B1FE5138E4; Wed, 24 Jan 2024 14:27:20 +0100 (CET) From: Kristof Provost To: "Herbert J. Skuhra" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 54c62e3e5d8c - main - pf: work around icmp6 packet-too-big not being sent when binat-ing Date: Wed, 24 Jan 2024 14:27:19 +0100 X-Mailer: MailMate (1.14r5937) Message-ID: <880FAE40-9D91-4AA6-92BA-2D582D23B745@FreeBSD.org> In-Reply-To: <87sf2nm4et.wl-herbert@gojira.at> References: <202401221252.40MCqpf6047526@gitrepo.freebsd.org> <87v87jkii9.wl-herbert@gojira.at> <1E1C3472-0AF3-457B-A27A-89679770EA62@FreeBSD.org> <87sf2nm4et.wl-herbert@gojira.at> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_8499D0A2-F28D-49C8-9CAD-F3540B67C559_=" --=_MailMate_8499D0A2-F28D-49C8-9CAD-F3540B67C559_= Content-Type: text/plain; format=flowed Content-Transfer-Encoding: quoted-printable On 24 Jan 2024, at 11:06, Herbert J. Skuhra wrote: > On Tue, 23 Jan 2024 19:42:10 +0100, Kristof Provost wrote: >> On 23 Jan 2024, at 19:32, Herbert J. Skuhra wrote: >>> On Mon, 22 Jan 2024 13:52:51 +0100, Kristof Provost wrote: >>>> >>>> The branch main has been updated by kp: >>>> >>>> URL: = >>>> https://cgit.FreeBSD.org/src/commit/?id=3D54c62e3e5d8cd90c5571a1d4c8= c5f062d580480e >>>> >>>> commit 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e >>>> Author: Kristof Provost >>>> AuthorDate: 2024-01-17 17:11:27 +0000 >>>> Commit: Kristof Provost >>>> CommitDate: 2024-01-22 11:52:14 +0000 >>>> >>>> pf: work around icmp6 packet-too-big not being sent when = >>>> binat-ing >>>> >>>> If we're applying NPTv6 we pass a packet with a modified source = >>>> and/or >>>> destination address to the network stack. >>>> >>>> If that packet then turns out to be larger than the MTU of the = >>>> sending >>>> interface the stack will attempt to generate an icmp6 = >>>> packet-too-big >>>> error, but may fail to look up the appropriate source address = >>>> for that >>>> error message. Even if it does, pf would still have to undo the = >>>> binat >>>> operation inside the icmp6 packet so the sending host can make = >>>> sense of >>>> the error. >>>> >>>> We can avoid both problems entirely by having pf also perform = >>>> the MTU >>>> check (taking the potential refragmentation into account), and >>>> generating the icmp6 error directly in pf. >>>> >>>> See also: https://redmine.pfsense.org/issues/14290 >>>> Sponsored by: Rubicon Communications, LLC ("Netgate") >>>> Differential Revision: https://reviews.freebsd.org/D43499 >>>> --- >>>> sys/net/pfvar.h | 1 + >>>> sys/netpfil/pf/pf.c | 12 ++++++++++++ >>>> sys/netpfil/pf/pf_norm.c | 15 +++++++++++++++ >>>> 3 files changed, 28 insertions(+) >>> >>> Does this change cause problems for others too? >>> >>> - ssh over IPv6 permanently disconnecting >>> (client_loop: send disconnect: Broken pipe) >>> - ssh connections over IPv6 hanging >>> - git pull not working >>> Fssh_ssh_dispatch_run_fatal: Connection to = >>> 2604:1380:4091:a001::24ca:1 port 22: Permission denied >>> fatal: Could not read from remote repository. >>> >> Can you include your pf.conf and a packet capture demonstrating one = >> of these issues? > > So I assume this issue affects only me or this server (igb nic). > Disabling tso6 seems to resolve the issue. > Ah. A Clue(tm)! Try this: diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 38a5a45d7991..2dc6d02d330a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8515,7 +8515,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, = struct mbuf **m0, struct inpcb * confused and fail to send the icmp6 packet too big error. = Just send * it here, before we do any NAT. */ - if (dir =3D=3D PF_OUT && IN6_LINKMTU(ifp) < pf_max_frag_size(m))= { + if (dir =3D=3D PF_OUT && pflags & PFIL_FWD && IN6_LINKMTU(ifp) <= = pf_max_frag_size(m)) { PF_RULES_RUNLOCK(); *m0 =3D NULL; icmp6_error(m, ICMP6_PACKET_TOO_BIG, 0, = IN6_LINKMTU(ifp)); Best regards, Kristof --=_MailMate_8499D0A2-F28D-49C8-9CAD-F3540B67C559_= Content-Type: text/html Content-Transfer-Encoding: quoted-printable

On 24 Jan 2024, at 11:06, Herbert J. Skuhra wrote:

On Tue, 23 Jan 2024 19:42:10 +0100,= Kristof Provost wrote:

On 23 Jan 2024, at 19:32, Herbert J. Skuhra wrote:

On Mon, 22 Jan 2024 13:52:51 +0100, Kristof Provost wrote:

The branch main has been updated by kp:

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

commit 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-01-17 17:11:27 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-01-22 11:52:14 +0000

pf: work around icmp6 packet-too-big not being sent w= hen binat-ing

If we're applying NPTv6 we pass a packet with a modif= ied source and/or
destination address to the network stack.

If that packet then turns out to be larger than the M= TU of the sending
interface the stack will attempt to generate an icmp6 packet-too-big
error, but may fail to look up the appropriate source address for tha= t
error message. Even if it does, pf would still have to undo the binat=
operation inside the icmp6 packet so the sending host can make sense = of
the error.

We can avoid both problems entirely by having pf also= perform the MTU
check (taking the potential refragmentation into account), and
generating the icmp6 error directly in pf.

See also: https://redmine.pfsense.org/issues/14290
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D43499
---
sys/net/pfvar.h | 1 +
sys/netpfil/pf/pf.c | 12 ++++++++++++
sys/netpfil/pf/pf_norm.c | 15 +++++++++++++++
3 files changed, 28 insertions(+)

Does this change cause problems for others t= oo?

- ssh over IPv6 permanently disconnecting
(client_loop: send disconnect: Broken pipe)
- ssh connections over IPv6 hanging
- git pull not working
Fssh_ssh_dispatch_run_fatal: Connection to 2604:1380:4091:a001::24ca:1 po= rt 22: Permission denied
fatal: Could not read from remote repository.

Can you include your pf.conf and a packet ca= pture demonstrating one of these issues?

So I assume this issue affects only me or th= is server (igb nic).
Disabling tso6 seems to resolve the issue.


Ah. A Clue(tm)!

Try this:

di=
ff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 38a5a45d7991..2dc6d02d330a 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -8515,7 +8515,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, st=
ruct mbuf **m0, struct inpcb
         * confused and fail to send the icmp6 packet too big error. Just=
 send
         * it here, before we do any NAT.
         */
-       if (dir =3D=3D PF_OUT && IN6_LINKMTU(ifp) < pf_max_fra=
g_size(m)) {
+       if (dir =3D=3D PF_OUT && pflags & PFIL_FWD &&=
 IN6_LINKMTU(ifp) < pf_max_frag_size(m)) {
                PF_RULES_RUNLOCK();
                *m0 =3D NULL;
                icmp6_error(m, ICMP6_PACKET_TOO_BIG, 0, IN6_LINKMTU(ifp))=
;

Best regards,
Kristof

--=_MailMate_8499D0A2-F28D-49C8-9CAD-F3540B67C559_=-- From nobody Wed Jan 24 14:14:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKmD00Fk1z585gQ; Wed, 24 Jan 2024 14:14: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 4TKmCz6Hz0z4dwb; Wed, 24 Jan 2024 14:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706105647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9y2LJ+82oAEDWf0D675gSyOO+lBMLtMwjoO36X7cEFU=; b=scKk7mBi/cMS6pvmYaqZusZZ9fStxdi/tY6tNAQKVXM3UMFFmWlTvIvpVfwJe81SAi/f4n e8NYsxJPRXn2UgQ4KunzEe0GYQR2y3p/cWgpXmwYp38F2ZZX6mNV8yHHLXuY3FS6RFf120 HetOCNWnOJ9O4ndFmHsoo3dg+qmoEXj4hjvka15Id86L0rwT7DfVRzkt7SXoj22Y8+vFX8 KjpzUS5sq9/l5UCKuaBNd4GquRF/DdGh4LYHIA1qUr+GfG7c/At50yW78zTuXxYme0M4ik 2NE4TvJPbBFuN8CCKgaqyq61XuJZEKJNEVlv+B0FpJsOLMsx9qOd14j/BzgzJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706105647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9y2LJ+82oAEDWf0D675gSyOO+lBMLtMwjoO36X7cEFU=; b=ArE/7+IavuToPwGdstxQDeSCrZG+U6mjwSOqN4PY/gmUeypAuwZltrpdGt5a0YslzExsDC HRskiLGJPz9uNIeJ14/KsmCYAbWwIfGyz6NmrQapm6Gdu5tNKWTAoO+cs/n15xEY/1Yj19 nxbi2jIq3Ua+C+kjgNzVQqg999P0xngfOIN4s6/s8nhpPOylxARPRwOx8P+GxfOLN1Ha+1 EoE35LM2HZJrxB1rz1jAE28An1fZFGCC8M80gHN46Wqi8Vmt1etcuDSzQ1pGxu1bO4tely W4xgmQLTW1EZQX3PEqyXAFKGGd8ndrcBJui9Ka+YLT0iby+ib9Y3UmqyBUTdrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706105647; a=rsa-sha256; cv=none; b=HA9VxnxGj6WbjB6UfDamnzjbG8oPoDgzy/seN+hNUIHqURKkG97y+L+QOnrulYE/y/qW4A qfE458ohXUN0jzuSV5SXekL97l2w/XIFJ2D5RpjRv/yWJ+BcC/dwtL7Q6wsDXrO5AcxgDt QCNnpXlyiwvwQ1mzMaLqJvbBIMDCRpvkvCOcdfj9gSPvDXSKr5qL00x28tmO/GGyxQVVfG vnFU/czFjFAAgM6xNnCH8qxVuirXOX1d1QL+vWAJuDpXXON1MvSjS7ji9UVWOmijSo0rXZ QEmmLA2BHUFV0fmc4ADYGrL2i5IPKNJADxo0h09hMx7ajAwgqkG9xGj34Y1Rng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKmCz5LPczHW0; Wed, 24 Jan 2024 14:14:07 +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 40OEE7FN049737; Wed, 24 Jan 2024 14:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OEE7sD049734; Wed, 24 Jan 2024 14:14:07 GMT (envelope-from git) Date: Wed, 24 Jan 2024 14:14:07 GMT Message-Id: <202401241414.40OEE7sD049734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1f41c1c1a3a9 - main - crunch: remove fdisk from examples List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f41c1c1a3a9883ed4b239ed3ec2f4cf183ce1e8 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1f41c1c1a3a9883ed4b239ed3ec2f4cf183ce1e8 commit 1f41c1c1a3a9883ed4b239ed3ec2f4cf183ce1e8 Author: Ed Maste AuthorDate: 2024-01-23 18:28:07 +0000 Commit: Ed Maste CommitDate: 2024-01-24 14:12:19 +0000 crunch: remove fdisk from examples It has been deprecated for a long time; gpart should be used instead. The man page was updated in 2015 to declare it obsolete (b8c19fd719945). --- usr.sbin/crunch/examples/filesystem.conf | 2 +- usr.sbin/crunch/examples/fixit.conf | 2 +- usr.sbin/crunch/examples/really-big.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf index 5be30f528cce..c9a6cf0ce018 100644 --- a/usr.sbin/crunch/examples/filesystem.conf +++ b/usr.sbin/crunch/examples/filesystem.conf @@ -12,7 +12,7 @@ ln sh - ln sh -sh # /sbin -progs disklabel fdisk init mount newfs reboot umount +progs disklabel init mount newfs reboot umount ln reboot halt ln reboot fastboot ln reboot fasthalt diff --git a/usr.sbin/crunch/examples/fixit.conf b/usr.sbin/crunch/examples/fixit.conf index 5596d58c45f1..7c6539cf8aa5 100644 --- a/usr.sbin/crunch/examples/fixit.conf +++ b/usr.sbin/crunch/examples/fixit.conf @@ -21,7 +21,7 @@ ln sh -sh # init invokes the shell this way # /sbin stuff -progs chown clri disklabel dump dmesg fdisk fsck ifconfig init +progs chown clri disklabel dump dmesg fsck ifconfig init progs mknod mount newfs ping reboot restore swapon umount ln dump rdump ln restore rrestore diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf index e6624a1ad836..12c08b73936f 100644 --- a/usr.sbin/crunch/examples/really-big.conf +++ b/usr.sbin/crunch/examples/really-big.conf @@ -22,7 +22,7 @@ ln sh -sh srcdirs /usr/src/sbin -progs bim clri disklabel dmesg dump dumpfs fdisk fsck halt +progs bim clri disklabel dmesg dump dumpfs fsck halt progs ifconfig init mknod modload modunload mount mount_isofs progs mount_lofs mount_msdosfs mountd progs newfs nfsd nfsiod ping quotacheck reboot restore route routed savecore From nobody Wed Jan 24 14:38:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKmmH6Hwsz58739; Wed, 24 Jan 2024 14:38: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 4TKmmH5lpyz4hWT; Wed, 24 Jan 2024 14:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706107119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlluVM/yq3t32HMGK4a0PSUY9YFzYHFhfm84svSrR7g=; b=wC0XHV7K7GMkC1PTC/tQMm1dWKwTnA/vhsi5+HHyfFfHNgtpwqvaf9Uti10xHZ+ocYfcHf qnDsSOur+/L/4ktMl/eMxWdyO4gWhRW+4UoZfH9xQxmCKAgoU0EFnwo7SFElWxCrfhP7gp 0s2QvVM5oKVOqsbXJkPSfBaYmPhhKD4s3WahDKksvUqXElS3Hyp7mFN4OyRaHT7Pc3wLix HRZ/tQEawJR/9ou7kiCmqnID43YDE1+ZhY+6rsH7Jje0nKDe5E7QhpvKFAEglHuXInieYU 0u193qit3GbmNvctVK/hxPe4VjuwaU5vlbdpvS4VUypPHAnpuTATZ2NnVipqEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706107119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlluVM/yq3t32HMGK4a0PSUY9YFzYHFhfm84svSrR7g=; b=yOF0pmdxxwqF8NkoLJ/0pXLZe0103zBlvXpF+Xl2nxUSTd2nOTAHhGkJdEAi22KX/MjepC n3cMTijfD01zoDa0psj0nASjxVqmjD3dWQZo9D7OQm0OoKDOLusBZIN01ux6fnLhbQue9/ YRTr8+4tYor4gZjh8ccprTNkbLJD+4eKuwxlDPzHBB2J9pKG1nxYcrHUfxIY1FYW5E1HoA zLRUu1O5yrQfAHKGTmV3e7Z3WkjZ+230I6O9lahObUWJaPRH6kajLR5rnezHf3NvkgYS7R IAfuilgLgfp70zDGp2OtnTZBnoCTmCHqP/wLIHMcjh4a5FGC1etXv5bmFsX/tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706107119; a=rsa-sha256; cv=none; b=MV+3izrkUQVc96fP3IJPf+iFNI0aUnE+Xgl8Z4N7beegGCKrz1Y2JcRROnmRAsaP3Y8hbA imSKnyNg6FDg7uMMJI4hw+2qk8MQSVmvvT44P0Qqv6KpULPKajxDjXhawWWstx/ZGQDFnS vtoToNa613Apyt0Ul4kLIAADaxmTZsHh0MFOhgpFwIVLkrh2Q2QRERQG/ufXxzT0d0mtuH z8zOFIYx+Z+r/MerrQ+STVzrSSunTlHBN5+HgFPuofbDsh31MICMvlQRO0C3eOZdyMeE95 78JX7svIHtBsK+5CQbww8BFgsEacgXyedsPnyevu0vbKyUxo1C7znJxiVTFr8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKmmH4j34zJFk; Wed, 24 Jan 2024 14:38: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 40OEcdMl083065; Wed, 24 Jan 2024 14:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OEcdul083062; Wed, 24 Jan 2024 14:38:39 GMT (envelope-from git) Date: Wed, 24 Jan 2024 14:38:39 GMT Message-Id: <202401241438.40OEcdul083062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2e9b8c8c1e39 - main - release: rework distributions list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e9b8c8c1e3938335e17e63049887f8e8c6e11bc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e9b8c8c1e3938335e17e63049887f8e8c6e11bc commit 2e9b8c8c1e3938335e17e63049887f8e8c6e11bc Author: Ed Maste AuthorDate: 2024-01-22 14:49:02 +0000 Commit: Ed Maste CommitDate: 2024-01-24 14:13:51 +0000 release: rework distributions list Components like base.txz and ports.txz are called distributions in the installer, and with the introduction of pkgbase we will start dealing with normal pkg packages in the installer. Rename EXTRA_PACKAGES to DISTRIBUTIONS, and move base.txz and kernel.txz to that list. This introduces no functional change but is a small cleanup in advance of some pkgbase experimentation. Reviewed by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43544 --- release/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release/Makefile b/release/Makefile index 3af7825c2684..3bfdde407cec 100644 --- a/release/Makefile +++ b/release/Makefile @@ -75,12 +75,12 @@ VOLUME_LABEL= FreeBSD_Install NOPORTS= true .endif -EXTRA_PACKAGES= +DISTRIBUTIONS= base.txz kernel.txz .if !defined(NOPORTS) -EXTRA_PACKAGES+= ports.txz +DISTRIBUTIONS+= ports.txz .endif .if !defined(NOSRC) -EXTRA_PACKAGES+= src.txz +DISTRIBUTIONS+= src.txz .endif RELEASE_TARGETS= ftp @@ -284,7 +284,7 @@ mini-memstick: mini-memstick.img mini-memstick.img: bootonly cd bootonly && sh ${.CURDIR}/${TARGET}/make-memstick.sh .${NO_ROOT:D/METALOG} ../${.TARGET} -packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} +packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST touch ${.TARGET} From nobody Wed Jan 24 14:43:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKmsM53Crz587sG; Wed, 24 Jan 2024 14:43: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 4TKmsM4cTQz4jKq; Wed, 24 Jan 2024 14:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706107383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsOunRQdzi+AMzA9iARS0SNTevZl9SzYoVANgX38RME=; b=cgOdQ8cFO7TUuY0UuvIzBD2SwqgMpsJ3ABJpQQ/Y+N4JRg0AdzhmtG1xDx4haE53zngH65 vTmRmuFPGJDddO4ApTU56qbEai3dq5X4y5qCrhOH6+4izV3ll2A0nj0jjOzpHEUI4icteB y5ISUz0VAo8hpRAOabdx8lKP6cLi0TH6UT6DG8sdFclwAVVs/wVfwB8lthmFjGGKz1Tgvy 0Ug6MHxww3JKTF2oQi/CLiYxa7AIKuQLtqElmA4Ei0KiSRUSvz9wD4UMgV1JJ29pN+1vPZ c+k3lXfAeKFIxyhQpYeQmR213PrcTY1WFV7peEotxJmxD+tmXBfV0dXvD0zs8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706107383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsOunRQdzi+AMzA9iARS0SNTevZl9SzYoVANgX38RME=; b=ZkJjE1OgATahzu+paYXOGvbJ8QPZ4DKpCkqib0CvtmN3otnsSXhjwxLLDPY3Y/3vILvERC xxZGlWZ3kPWzy4LwkmeWKJWEV09gFIvI+2VxXX/iMOgb2jgxlvlI4s6kLU2wCYkq7+dVGx /wqXjujFddTKomRjuGqRcGlOaQbP/xop+napZcYFRq0k/6MAsttRUPjal5GGhS8qbOlYm9 fnAsp7sNJzyeyZtl6fiiGjz/2fqUBpNgRGesIaPOz+ucDFyjL/hy/QRd6/C0rvrdN2AA+P qadAfwHg4wTuWYxz+039MWDaP2iDKYrGzxsqILNSykyr9cQfvTI2K1cXgBxS0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706107383; a=rsa-sha256; cv=none; b=WYToBsCOWLDH4V3syE4/kmOyU/NG85oiNcILME5fG0MsX5SrakbEP0TnwQprC4RT85TuIf 6sHYjcykHjlC10pTT7mA2np3FqahnppXddxyagYLRmqTz5byucjcVE9bZM9IXH8qBmAgmL xXI6B9hB1hEazK+DaY18pu/Ks3J/dnm3mr0oXKm9/vHaUkkIz1PZmYo9QPNDk0GaNWstb2 //u9oX0iqRuXLt83NaYZbiH8NyJEeH061d05KGq8L3zGWqJvmazxXPSNrCZ+kX9jDD1js9 KmhaHaAkQ1ET5rLoKn8a7HO1WwkqOHclBRxCYDL0/V6k+cLgN002SLfplnSIdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKmsM3jZPzJN9; Wed, 24 Jan 2024 14:43: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 40OEh3tg098822; Wed, 24 Jan 2024 14:43:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OEh3b4098819; Wed, 24 Jan 2024 14:43:03 GMT (envelope-from git) Date: Wed, 24 Jan 2024 14:43:03 GMT Message-Id: <202401241443.40OEh3b4098819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: af0d437dd31f - main - kcmp: Add a manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af0d437dd31f71726f7eb5e9aca9fbd374a8277a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=af0d437dd31f71726f7eb5e9aca9fbd374a8277a commit af0d437dd31f71726f7eb5e9aca9fbd374a8277a Author: Mark Johnston AuthorDate: 2024-01-24 14:41:31 +0000 Commit: Mark Johnston CommitDate: 2024-01-24 14:42:15 +0000 kcmp: Add a manual page Reviewed by: kib, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43562 --- lib/libc/sys/Makefile.inc | 1 + lib/libc/sys/kcmp.2 | 230 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 231 insertions(+) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 4137699bb741..b533443f96b2 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -215,6 +215,7 @@ MAN+= abort2.2 \ ioctl.2 \ issetugid.2 \ jail.2 \ + kcmp.2 \ kenv.2 \ kill.2 \ kldfind.2 \ diff --git a/lib/libc/sys/kcmp.2 b/lib/libc/sys/kcmp.2 new file mode 100644 index 000000000000..5491e09b918b --- /dev/null +++ b/lib/libc/sys/kcmp.2 @@ -0,0 +1,230 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 The FreeBSD Foundation +.\" +.\" This documentation was written by +.\" Mark Johnston under sponsorship +.\" from the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd January 23, 2024 +.Dt KCMP 2 +.Os +.Sh NAME +.Nm kcmp +.Nd compare two kernel objects +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In unistd.h +.Ft int +.Fn kcmp "pid_t pid1" "pid_t pid2" "int type" "uintptr_t idx1" "uintptr_t idx2" +.Sh DESCRIPTION +The +.Nm +system call allows the caller to determine whether the two processes with +PIDs +.Fa pid1 +and +.Fa pid2 +reference the same kernel object. +The +.Fa type +parameter specifies the type of object, and +.Fa idx1 +and +.Fa idx2 +are identifiers which refer to some object in the context of process +.Fa pid1 +and +.Fa pid2 , +respectively. +.Pp +The following values for +.Fa type +may be specified: +.Bl -tag -width KCMP_FILE +.It Dv KCMP_FILE +Compare two file descriptions referred to by file descriptors +.Fa idx1 +and +.Fa idx2 . +They may be equivalent if, for example, one of the descriptors was +created by applying +.Xr dup 2 +to the other descriptor. +.It Dv KCMP_FILEOBJ +Perform a +.Dq deep comparison +of the file descriptions referred to by file descriptors +.Fa idx1 +and +.Fa idx2 . +This tests whether the underlying object referred to by the file descriptions +is the same. +For example, if the same filesystem path is opened twice, the kernel will create +two separate file descriptions to back the two file descriptors, but they will +refer to the same underlying object, a +.Xr vnode 9 . +When compared using the +.Dv KCMP_FILE +type, these descriptors will be different, but using the +.Dv KCMP_FILEOBJ +type, they will be equal (assuming that the path was not unlinked in between +the two opens). +.It Dv KCMP_FILES +Determine whether the two processes share the same file descriptor table. +This will be the case if one of the processes was created by +.Xr rfork 2 +without specifying the +.Dv RFFDG +flag. +The +.Fa idx1 +and +.Fa idx2 +parameters are ignored. +.It Dv KCMP_SIGHAND +Determine whether the two processes share the same signal handler table. +This will be the case if one of the processes was created using the +.Dv RFSIGSHARE +flag to +.Xr rfork 2 . +The +.Fa idx1 +and +.Fa idx2 +parameters are ignored. +.It Dv KCMP_VM +Determine whether the two processes share a virtual memory address space. +This may be the case if one of the processes created the other using +.Xr vfork 2 +or +.Xr rfork 2 +with the +.Dv RFMEM +flag. +The +.Fa idx1 +and +.Fa idx2 +parameters are ignored. +.El +The caller of +.Nm +must have permission to debug both processes, otherwise the system call +will fail. +.Sh RETURN VALUES +If +.Fa idx1 +and +.Fa idx2 +refer to the same object, +.Nm +returns 0. +If the object referred to by +.Fa pid1 +and +.Fa idx1 +is less or greater than the object referred to by +.Fa pid2 +and +.Fa idx2 , +.Nm +returns the values 1 and 2, respectively. +The order is defined internally by the kernel and is stable until the system +reboots. +If the two objects cannot be compared for some reason, +.Nm +returns 3. +For example, if +.Fa type +is +.Dv KCMP_FILEOBJ +and +.Fa idx1 +and +.Fa idx2 +are different descriptor types, e.g., a socket and a file, then +.Nm +will return 3. +.Pp +If an error occurs, the value -1 is returned and the global variable +.Va errno +is set to indicate the error. +.Sh ERRORS +.Nm +may fail with the following errors: +.Bl -tag -width Er +.It Bq Er ENODEV +.Dv KCMP_FILEOBJ +was specified and +.Fa idx1 +refers to a file descriptor which does not implement a comparison operator. +.It Bq Er EINVAL +The value of +.Fa type +is invalid. +.It Bq Er EBADF +One of the file descriptors referred to by +.Fa idx1 +or +.Fa idx2 +is not valid. +.It Bq Er ESRCH +One of the processes referred to by +.Fa pid1 +or +.Fa pid2 +does not exist or is not visible (e.g., due to jail restrictions). +.It Bq Er EPERM +The caller does not have permission to access one of the processes referred to +by +.Fa pid1 +or +.Fa pid2 . +.El +.Sh SEE ALSO +.Xr dup 2 , +.Xr fcntl 2 , +.Xr fork 2 , +.Xr rfork 2 , +.Xr vfork 2 +.Sh STANDARDS +The +.Nm +system call originated in Linux. +This implementation aims to be source-compatible with the Linux implementation. +.Fx +implements only a subset of the possible values for +.Fa type +supported in Linux. +More values may be added in the future. +The +.Dv KCMP_FILEOBJ +type is a FreeBSD extension. +.Sh HISTORY +The +.Nm +function was introduced in +.Fx 14.1 . From nobody Wed Jan 24 16:28:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKqD95HrZz58Jph; Wed, 24 Jan 2024 16:29:29 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKqD92k7jz4v1Q; Wed, 24 Jan 2024 16:29:29 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Date: Wed, 24 Jan 2024 17:28:38 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1706113767; bh=rP0lzA1yaXhB06G/N9KZuNiV72P6EGWrdrvMozFNEbE=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=kieNowSaKHw5RIeRofZonS2wumGt0GrHhngVAwCoQm9lB9OG2UFlPGpunPuk5CY9C izxH0jnGPnFx3nvMixNacnk+pLmKny2byPXRtNQr5zx3ThXfwjbgMQSIXIE1GI7nrP F/2DiJRf6tQOObuZNskPEc9RGhj4nMYCumD09MmaN49pabFyxRJzGs3gliO4uAhX5f LjJcwNcbkN3+pNloCLe8Mp8tL3OFcrF6PJlEaqi/CCvGFWGxF4U+lbkMhjbS1bWOBV 37jHb8hY6Mf4OjKVItNOLfF8jKvQirFvbxjYWoigN9Zh6TGIfhkfJGyYtfKqRjHy1u /Zh428NK/j2Qg== Message-ID: <87jznylmq1.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Kristof Provost Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 54c62e3e5d8c - main - pf: work around icmp6 packet-too-big not being sent when binat-ing In-Reply-To: <880FAE40-9D91-4AA6-92BA-2D582D23B745@FreeBSD.org> References: <202401221252.40MCqpf6047526@gitrepo.freebsd.org> <87v87jkii9.wl-herbert@gojira.at> <1E1C3472-0AF3-457B-A27A-89679770EA62@FreeBSD.org> <87sf2nm4et.wl-herbert@gojira.at> <880FAE40-9D91-4AA6-92BA-2D582D23B745@FreeBSD.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/29.2 Mule/6.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4TKqD92k7jz4v1Q X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE] On Wed, 24 Jan 2024 14:27:19 +0100, Kristof Provost wrote: > On 24 Jan 2024, at 11:06, Herbert J. Skuhra wrote: > > On Tue, 23 Jan 2024 19:42:10 +0100, Kristof Provost wrote: > >> On 23 Jan 2024, at 19:32, Herbert J. Skuhra wrote: > >>> On Mon, 22 Jan 2024 13:52:51 +0100, Kristof Provost wrote: > >>>> > >>>> The branch main has been updated by kp: > >>>> > >>>> URL: > >>>> https://cgit.FreeBSD.org/src/commit/?id=54c62e3e5d8cd90c5571a1d4c8c5f062d580480e > >>>> > >>>> commit 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e > >>>> Author: Kristof Provost > >>>> AuthorDate: 2024-01-17 17:11:27 +0000 > >>>> Commit: Kristof Provost > >>>> CommitDate: 2024-01-22 11:52:14 +0000 > >>>> > >>>> pf: work around icmp6 packet-too-big not being sent when > >>>> binat-ing > >>>> > >>>> If we're applying NPTv6 we pass a packet with a modified > >>>> source and/or > >>>> destination address to the network stack. > >>>> > >>>> If that packet then turns out to be larger than the MTU of > >>>> the sending > >>>> interface the stack will attempt to generate an icmp6 > >>>> packet-too-big > >>>> error, but may fail to look up the appropriate source address > >>>> for that > >>>> error message. Even if it does, pf would still have to undo > >>>> the binat > >>>> operation inside the icmp6 packet so the sending host can > >>>> make sense of > >>>> the error. > >>>> > >>>> We can avoid both problems entirely by having pf also perform > >>>> the MTU > >>>> check (taking the potential refragmentation into account), and > >>>> generating the icmp6 error directly in pf. > >>>> > >>>> See also: https://redmine.pfsense.org/issues/14290 > >>>> Sponsored by: Rubicon Communications, LLC ("Netgate") > >>>> Differential Revision: https://reviews.freebsd.org/D43499 > >>>> --- > >>>> sys/net/pfvar.h | 1 + > >>>> sys/netpfil/pf/pf.c | 12 ++++++++++++ > >>>> sys/netpfil/pf/pf_norm.c | 15 +++++++++++++++ > >>>> 3 files changed, 28 insertions(+) > >>> > >>> Does this change cause problems for others too? > >>> > >>> - ssh over IPv6 permanently disconnecting > >>> (client_loop: send disconnect: Broken pipe) > >>> - ssh connections over IPv6 hanging > >>> - git pull not working > >>> Fssh_ssh_dispatch_run_fatal: Connection to > >>> 2604:1380:4091:a001::24ca:1 port 22: Permission denied > >>> fatal: Could not read from remote repository. > >>> > >> Can you include your pf.conf and a packet capture demonstrating one > >> of these issues? > > > > So I assume this issue affects only me or this server (igb nic). > > Disabling tso6 seems to resolve the issue. > > > Ah. A Clue(tm)! > > Try this: > > diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c > index 38a5a45d7991..2dc6d02d330a 100644 > --- a/sys/netpfil/pf/pf.c > +++ b/sys/netpfil/pf/pf.c > @@ -8515,7 +8515,7 @@ pf_test6(int dir, int pflags, struct > ifnet *ifp, struct mbuf **m0, struct inpcb > * confused and fail to send the icmp6 packet too big > error. Just send > * it here, before we do any NAT. > */ > - if (dir == PF_OUT && IN6_LINKMTU(ifp) < pf_max_frag_size(m)) { > + if (dir == PF_OUT && pflags & PFIL_FWD && > IN6_LINKMTU(ifp) < pf_max_frag_size(m)) { > PF_RULES_RUNLOCK(); > *m0 = NULL; > icmp6_error(m, ICMP6_PACKET_TOO_BIG, 0, > IN6_LINKMTU(ifp)); This patch fixes the issue. Thanks a lot. -- Herbert From nobody Wed Jan 24 16:41:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKqTp1XGYz58KVY; Wed, 24 Jan 2024 16:41: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 4TKqTn5p9qz4wZp; Wed, 24 Jan 2024 16:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706114477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CYHYCAShoa6xiIe9VY9FKbPSrmp6G31to9rWy1mksmg=; b=sCbzBrYyP6pFPzXMBJlMhdRgLEJunynvPYYJsbjYe8U291/YSvn/wyx2XWIcInjQCWGkTv dAMPpdAh5mEITgGKBDB+ECoi/roBfliQ64sR0iLSYyoROwDqfOUtDDpZgzPruJTqJh4fPf VvfOW3vBitHy0hc61cVyGsCcE/us6HXeAwt+MOCFjG2t4CMCbcyI22bSv/XsqZjpL4sOQu 1fnqyIRCQU00eEgTfKRqJCU63p3GW6RYqNoxoABth3Mihi6tHu+TdebiM2ZByGreJSKUzU 7HdP2NH6dQXI/xHT8IJeC6q6fwyJAqCTZwbxDCa4bj9VcxwukFHYLFaFWMnpLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706114477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CYHYCAShoa6xiIe9VY9FKbPSrmp6G31to9rWy1mksmg=; b=JX3SVu31cBjHF3cOImKnVpYI2zl68J4xNoTeu2WWg+gChFviPt6+FSBYT8xfTfeoduGYWl djybp5CBmeBII8wr7GG1rIRWaHr4Rzrr+nHerfac+BUBoUlqqksCCv1VLxOGTJGVHxdrCC oX0gs19Hg2kJ7Eq/SpXr9Mbjy26o0Uoa2L3hIa1Xp79fci6bIE7eJy7gIM6YjBgew58TTp 2HkC/iGoaAwmGlOlTszwkP3lgiqbNY2J68/hHaCcPo2NPMtJUTL97yEZwgTWRlsHYuMZQT rYHZbBKkavMsX5mj20ra8bzKvMeROZMlIq1BuRJkrfIvZhy11gGc2L+4UsQVdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706114477; a=rsa-sha256; cv=none; b=PnVqIvPv9POzkk6FmQfi7lWncWBdMMNVB4yjoXGpkmgrp1YqDjpmJhqiYiUJsdSAd5W24N mo2dEjpbCCab1geJAzt4a7QRzV2qNrVxdzSH/XcPFDRIK0dJwuAEb3jS3MFjmLQHHb7bAZ UAg3/7yWa6cJiZZDiOHOirrwrIij1paXshk8xf0q8wf10ZL9Le6/qYyA+2buIM6SrMSIty rIaANMPBeb9nFKsIil+kTx8lqqrTQfMF5/1bEcz12twoWvZXb/7aujWO/uTV55u5LkjF9E gLnMjNdJO6+MUozHsTRJPSsVcCLnSihLbwctaGyFjkv0uMmn3rrrY3wjltF1mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKqTn3mRRzMQd; Wed, 24 Jan 2024 16:41: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 40OGfH0g095846; Wed, 24 Jan 2024 16:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OGfH1O095843; Wed, 24 Jan 2024 16:41:17 GMT (envelope-from git) Date: Wed, 24 Jan 2024 16:41:17 GMT Message-Id: <202401241641.40OGfH1O095843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: c7c325d01de4 - main - tcp: pass maxseg around instead of calculating locally List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7c325d01de4a1509e0a978f28275279de692130 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=c7c325d01de4a1509e0a978f28275279de692130 commit c7c325d01de4a1509e0a978f28275279de692130 Author: Richard Scheffenegger AuthorDate: 2024-01-24 15:42:29 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-24 15:43:29 +0000 tcp: pass maxseg around instead of calculating locally Improve slowpath processing (reordering, retransmissions) slightly by calculating maxseg only once. This typically saves one of two calls to tcp_maxseg(). Reviewed By: glebius, tuexen, cc, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43536 --- sys/netinet/tcp_input.c | 37 +++++++++++++++++++++++++------------ sys/netinet/tcp_sack.c | 9 +++++++-- sys/netinet/tcp_var.h | 8 +++++--- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index ed5f28490852..02b042fd3273 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1529,7 +1529,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, struct mbuf *mfree; struct tcpopt to; int tfo_syn; - u_int maxseg; + u_int maxseg = 0; thflags = tcp_get_flags(th); tp->sackhint.last_sack_ack = 0; @@ -2596,7 +2596,8 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if (V_tcp_do_prr && IN_FASTRECOVERY(tp->t_flags) && (tp->t_flags & TF_SACK_PERMIT)) { - tcp_do_prr_ack(tp, th, &to, sack_changed); + tcp_do_prr_ack(tp, th, &to, + sack_changed, &maxseg); } else if (tcp_is_sack_recovery(tp, &to) && IN_FASTRECOVERY(tp->t_flags)) { int awnd; @@ -2801,19 +2802,24 @@ resume_partialack: */ if (IN_FASTRECOVERY(tp->t_flags)) { if (SEQ_LT(th->th_ack, tp->snd_recover)) { - if (tp->t_flags & TF_SACK_PERMIT) + if (tp->t_flags & TF_SACK_PERMIT) { if (V_tcp_do_prr && to.to_flags & TOF_SACK) { tcp_timer_activate(tp, TT_REXMT, 0); tp->t_rtttime = 0; - tcp_do_prr_ack(tp, th, &to, sack_changed); + tcp_do_prr_ack(tp, th, &to, + sack_changed, &maxseg); tp->t_flags |= TF_ACKNOW; (void) tcp_output(tp); - } else - tcp_sack_partialack(tp, th); - else + } else { + tcp_sack_partialack(tp, th, + &maxseg); + } + } else { tcp_newreno_partial_ack(tp, th); - } else + } + } else { cc_post_recovery(tp, th); + } } else if (IN_CONGRECOVERY(tp->t_flags)) { if (SEQ_LT(th->th_ack, tp->snd_recover)) { if (V_tcp_do_prr) { @@ -2823,11 +2829,13 @@ resume_partialack: * During ECN cwnd reduction * always use PRR-SSRB */ - tcp_do_prr_ack(tp, th, &to, SACK_CHANGE); + tcp_do_prr_ack(tp, th, &to, SACK_CHANGE, + &maxseg); (void) tcp_output(tp); } - } else + } else { cc_post_recovery(tp, th); + } } /* * If we reach this point, ACK is not a duplicate, @@ -3946,13 +3954,18 @@ tcp_mssopt(struct in_conninfo *inc) } void -tcp_do_prr_ack(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to, sackstatus_t sack_changed) +tcp_do_prr_ack(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to, + sackstatus_t sack_changed, u_int *maxsegp) { int snd_cnt = 0, limit = 0, del_data = 0, pipe = 0; - int maxseg = tcp_maxseg(tp); + u_int maxseg; INP_WLOCK_ASSERT(tptoinpcb(tp)); + if (*maxsegp == 0) { + *maxsegp = tcp_maxseg(tp); + } + maxseg = *maxsegp; /* * Compute the amount of data that this ACK is indicating * (del_data) and an estimate of how many bytes are in the diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index f9ca83850c09..f517bb9fcdb7 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -936,13 +936,18 @@ tcp_resend_sackholes(struct tcpcb *tp) * the midst of sack recovery. */ void -tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th) +tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th, u_int *maxsegp) { struct sackhole *temp; int num_segs = 1; - u_int maxseg = tcp_maxseg(tp); + u_int maxseg; INP_WLOCK_ASSERT(tptoinpcb(tp)); + + if (*maxsegp == 0) { + *maxsegp = tcp_maxseg(tp); + } + maxseg = *maxsegp; tcp_timer_activate(tp, TT_REXMT, 0); tp->t_rtttime = 0; /* Send one or 2 segments based on how much new data was acked. */ diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index f9b3d1a5c3ee..cbe8de7988c7 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1481,14 +1481,16 @@ sackstatus_t tcp_sack_doack(struct tcpcb *, struct tcpopt *, tcp_seq); int tcp_dsack_block_exists(struct tcpcb *); void tcp_update_dsack_list(struct tcpcb *, tcp_seq, tcp_seq); -void tcp_update_sack_list(struct tcpcb *tp, tcp_seq rcv_laststart, tcp_seq rcv_lastend); +void tcp_update_sack_list(struct tcpcb *tp, tcp_seq rcv_laststart, + tcp_seq rcv_lastend); void tcp_clean_dsack_blocks(struct tcpcb *tp); void tcp_clean_sackreport(struct tcpcb *tp); void tcp_sack_adjust(struct tcpcb *tp); struct sackhole *tcp_sack_output(struct tcpcb *tp, int *sack_bytes_rexmt); -void tcp_do_prr_ack(struct tcpcb *, struct tcphdr *, struct tcpopt *, sackstatus_t); +void tcp_do_prr_ack(struct tcpcb *, struct tcphdr *, struct tcpopt *, + sackstatus_t, u_int *); void tcp_lost_retransmission(struct tcpcb *, struct tcphdr *); -void tcp_sack_partialack(struct tcpcb *, struct tcphdr *); +void tcp_sack_partialack(struct tcpcb *, struct tcphdr *, u_int *); void tcp_resend_sackholes(struct tcpcb *tp); void tcp_free_sackholes(struct tcpcb *tp); void tcp_sack_lost_retransmission(struct tcpcb *, struct tcphdr *); From nobody Wed Jan 24 17:34:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKrgk23bpz58QC7; Wed, 24 Jan 2024 17:34: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 4TKrgk1qRcz52s4; Wed, 24 Jan 2024 17:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706117698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZvpO3YJn38KRgRqTGe7Wn+sV46rtjLmVA401xBugJ6o=; b=WTzk8lmksRRVYfiTZe+IbVRXjcDqcveGQ3BMrBRu3JFOM5GGLwWpucG6nVUmoGv3JDZGL3 eEd1Rrsrj/TluPepVSLJGQf6rNY3YnzJonGs7ql9gZ2B1R/juRMvkyodCMmooifbP1Rfsz 1Lp6ecZlR+na1suJ8DJRmwBWWSCI4CZXizpQ31G13bd/pNfVS2r3GbAs2z+VOPyhdgqaIa aOdUYh0K4wCdZLC/ClrD+w68BBysKZ9JtK6EecIUy2GdTwweOFfE1a+XsBOL7Pn/ogXlKC P9Huojh+sE1ZDWbiYInDQ9t79GKeiUbp3kikRyF2qkYaPg3ItkDt0NSI2iJrzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706117698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZvpO3YJn38KRgRqTGe7Wn+sV46rtjLmVA401xBugJ6o=; b=ZPpy4E84guA6zCvCZEs3YVCdEWWV8Bhc2EGXuD7p3SU1n9it60U20XTSNRqSVCH6Dp6uhA DnY4SuBlPkCUtJSFodlVf4ntOmP5oD689khumLCKZhCSE46FgatvaxcA4AxD0uj2nDL+hI vcefhyr0+9M9NSyLqTpWjJ64ArAIP3CL+70gLjJNEoYvr+hxfaReLag1wn8HVXnspC4Eft Ml93tdFXB+udAaxG7N5PTcWrHRubOcygIimTFGxhOwzny3ERL7OdvzVF62hu0Ppm3U8fH8 QDv7m/DhAwT2soW+sliIN4cq6OP0K2DW9FAVwnjJQ49fkRBu2CXlCyCPfpJA9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706117698; a=rsa-sha256; cv=none; b=H7W87a7Yo3bwbD0RvNWxh9f0phz2MEV4gtGqmWKukOSqAQ3y/sX0e2b+L9yYHrdmiPg31s vSn2Gwg9L3n83DBlqLsnf8J57s6VruB5gUzUj0kVB+Bept+aziErHlbts6Q89GjPQa3LFX lO0T8BwFrmtxre32e0HH4C97JKBOlECu3+tp8duRVMBJGq6oObAd/SyvqnyjvYbaDbu7wI xCXqhcue652sIoKbOOKW1zOhdS8y4kq4rBxzp7tUVbuGK/M2y8tELdG/BkFj2QCtej48ky 3+9n7E4msgmy9gZ3+Axam7/hDOpOJRbz/UVVg63LT1zbKNKtXDngveynWfs4YA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKrgk0m24zNxW; Wed, 24 Jan 2024 17:34: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 40OHYwt0086197; Wed, 24 Jan 2024 17:34:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OHYvCK086194; Wed, 24 Jan 2024 17:34:57 GMT (envelope-from git) Date: Wed, 24 Jan 2024 17:34:57 GMT Message-Id: <202401241734.40OHYvCK086194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 5fc3104ae738 - main - callout: retire callout_async_drain() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fc3104ae7389a0937f55af5157761c64b8a0668 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=5fc3104ae7389a0937f55af5157761c64b8a0668 commit 5fc3104ae7389a0937f55af5157761c64b8a0668 Author: Gleb Smirnoff AuthorDate: 2024-01-24 17:33:27 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-24 17:33:27 +0000 callout: retire callout_async_drain() This function was used only in TCP before 446ccdd08e2a. It was born in pain in 2016 to plug different complex panics in TCP timers. It wasn't warmly accepted in phabricator by all of the reviewers and my recollection of overall agreement was that "if you need this KPI, then you'd better fix your code to not need it". However, the function served its duty well all the way to FreeBSD 14. But now that TCP doesn't need it anymore, let's retire it to reduce complexity of callout code and also to avoid its further use. Reviewed by: jhb, markj, kib, rrs Differential Revision: https://reviews.freebsd.org/D43546 --- ObsoleteFiles.inc | 3 + share/man/man9/Makefile | 1 - share/man/man9/callout.9 | 29 +--- sys/kern/kern_timeout.c | 37 +---- sys/modules/tests/Makefile | 1 - sys/modules/tests/callout_test/Makefile | 14 -- sys/sys/callout.h | 8 +- sys/tests/callout_test.h | 32 ---- sys/tests/callout_test/callout_test.c | 282 -------------------------------- 9 files changed, 12 insertions(+), 395 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index a6c15187e847..2ba4e487ad0b 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240122: callout_async_drain() removed +OLD_FILES+=usr/share/man/man9/callout_async_drain.9.gz + # 20240114: Removal of geom_map(4) OLD_FILES+=usr/share/man/man4/geom_map.4 diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 3f9572796fa1..c98849b42a7b 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -810,7 +810,6 @@ MLINKS+=byteorder.9 be16dec.9 \ byteorder.9 le64enc.9 \ byteorder.9 le64toh.9 MLINKS+=callout.9 callout_active.9 \ - callout.9 callout_async_drain.9 \ callout.9 callout_deactivate.9 \ callout.9 callout_drain.9 \ callout.9 callout_init.9 \ diff --git a/share/man/man9/callout.9 b/share/man/man9/callout.9 index 96b93283bfc2..0e59ef8ab2b1 100644 --- a/share/man/man9/callout.9 +++ b/share/man/man9/callout.9 @@ -27,13 +27,12 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 1, 2021 +.Dd January 22, 2024 .Dt CALLOUT 9 .Os .Sh NAME .Nm callout_active , .Nm callout_deactivate , -.Nm callout_async_drain , .Nm callout_drain , .Nm callout_init , .Nm callout_init_mtx , @@ -66,8 +65,6 @@ typedef void callout_func_t (void *); .Ft void .Fn callout_deactivate "struct callout *c" .Ft int -.Fn callout_async_drain "struct callout *c" "callout_func_t *drain" -.Ft int .Fn callout_drain "struct callout *c" .Ft void .Fn callout_init "struct callout *c" "int mpsafe" @@ -293,30 +290,6 @@ If the callout has an associated lock, then that lock must be held when this function is called. .Pp The function -.Fn callout_async_drain -is identical to -.Fn callout_stop -with one difference. -When -.Fn callout_async_drain -returns zero it will arrange for the function -.Fa drain -to be called using the same argument given to the -.Fn callout_reset -function. -.Fn callout_async_drain -If the callout has an associated lock, -then that lock must be held when this function is called. -Note that when stopping multiple callouts that use the same lock it is possible -to get multiple return's of zero and multiple calls to the -.Fa drain -function, depending upon which CPU's the callouts are running. -The -.Fa drain -function itself is called from the context of the completing callout -i.e. softclock or hardclock, just like a callout itself. -.Pp -The function .Fn callout_drain is identical to .Fn callout_stop diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index dbe7ec0a4a76..5f2d78285c66 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -142,7 +142,6 @@ static u_int __read_mostly callwheelmask; */ struct cc_exec { struct callout *cc_curr; - callout_func_t *cc_drain; void *cc_last_func; void *cc_last_arg; #ifdef SMP @@ -180,7 +179,6 @@ struct callout_cpu { #define cc_exec_curr(cc, dir) cc->cc_exec_entity[dir].cc_curr #define cc_exec_last_func(cc, dir) cc->cc_exec_entity[dir].cc_last_func #define cc_exec_last_arg(cc, dir) cc->cc_exec_entity[dir].cc_last_arg -#define cc_exec_drain(cc, dir) cc->cc_exec_entity[dir].cc_drain #define cc_exec_next(cc) cc->cc_next #define cc_exec_cancel(cc, dir) cc->cc_exec_entity[dir].cc_cancel #define cc_exec_waiting(cc, dir) cc->cc_exec_entity[dir].cc_waiting @@ -631,7 +629,7 @@ softclock_call_cc(struct callout *c, struct callout_cpu *cc, int direct) { struct rm_priotracker tracker; - callout_func_t *c_func, *drain; + callout_func_t *c_func; void *c_arg; struct lock_class *class; struct lock_object *c_lock; @@ -673,7 +671,6 @@ softclock_call_cc(struct callout *c, struct callout_cpu *cc, cc_exec_last_func(cc, direct) = c_func; cc_exec_last_arg(cc, direct) = c_arg; cc_exec_cancel(cc, direct) = false; - cc_exec_drain(cc, direct) = NULL; CC_UNLOCK(cc); if (c_lock != NULL) { class->lc_lock(c_lock, lock_status); @@ -739,13 +736,6 @@ skip: CC_LOCK(cc); KASSERT(cc_exec_curr(cc, direct) == c, ("mishandled cc_curr")); cc_exec_curr(cc, direct) = NULL; - if (cc_exec_drain(cc, direct)) { - drain = cc_exec_drain(cc, direct); - cc_exec_drain(cc, direct) = NULL; - CC_UNLOCK(cc); - drain(c_arg); - CC_LOCK(cc); - } if (cc_exec_waiting(cc, direct)) { /* * There is someone waiting for the @@ -969,7 +959,7 @@ callout_reset_sbt_on(struct callout *c, sbintime_t sbt, sbintime_t prec, */ if (c->c_lock != NULL && !cc_exec_cancel(cc, direct)) cancelled = cc_exec_cancel(cc, direct) = true; - if (cc_exec_waiting(cc, direct) || cc_exec_drain(cc, direct)) { + if (cc_exec_waiting(cc, direct)) { /* * Someone has called callout_drain to kill this * callout. Don't reschedule. @@ -1080,7 +1070,7 @@ callout_schedule(struct callout *c, int to_ticks) } int -_callout_stop_safe(struct callout *c, int flags, callout_func_t *drain) +_callout_stop_safe(struct callout *c, int flags) { struct callout_cpu *cc, *old_cc; struct lock_class *class; @@ -1091,9 +1081,6 @@ _callout_stop_safe(struct callout *c, int flags, callout_func_t *drain) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, c->c_lock, "calling %s", __func__); - KASSERT((flags & CS_DRAIN) == 0 || drain == NULL, - ("Cannot set drain callback and CS_DRAIN flag at the same time")); - /* * Some old subsystems don't hold Giant while running a callout_stop(), * so just discard this check for the moment. @@ -1228,8 +1215,7 @@ again: goto again; } c->c_flags &= ~CALLOUT_ACTIVE; - } else if (use_lock && - !cc_exec_cancel(cc, direct) && (drain == NULL)) { + } else if (use_lock && !cc_exec_cancel(cc, direct)) { /* * The current callout is waiting for its @@ -1237,8 +1223,7 @@ again: * and return. After our caller drops the * lock, the callout will be skipped in * softclock(). This *only* works with a - * callout_stop() *not* callout_drain() or - * callout_async_drain(). + * callout_stop() *not* with callout_drain(). */ cc_exec_cancel(cc, direct) = true; CTR3(KTR_CALLOUT, "cancelled %p func %p arg %p", @@ -1284,23 +1269,11 @@ again: #endif CTR3(KTR_CALLOUT, "postponing stop %p func %p arg %p", c, c->c_func, c->c_arg); - if (drain) { - KASSERT(cc_exec_drain(cc, direct) == NULL, - ("callout drain function already set to %p", - cc_exec_drain(cc, direct))); - cc_exec_drain(cc, direct) = drain; - } CC_UNLOCK(cc); return (0); } else { CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p", c, c->c_func, c->c_arg); - if (drain) { - KASSERT(cc_exec_drain(cc, direct) == NULL, - ("callout drain function already set to %p", - cc_exec_drain(cc, direct))); - cc_exec_drain(cc, direct) = drain; - } } KASSERT(!sq_locked, ("sleepqueue chain still locked")); cancelled = 0; diff --git a/sys/modules/tests/Makefile b/sys/modules/tests/Makefile index abc077ffa2df..7481a0a3a4b4 100644 --- a/sys/modules/tests/Makefile +++ b/sys/modules/tests/Makefile @@ -1,7 +1,6 @@ SUBDIR+= framework SUBDIR+= .WAIT -SUBDIR+= callout_test SUBDIR_PARALLEL= diff --git a/sys/modules/tests/callout_test/Makefile b/sys/modules/tests/callout_test/Makefile deleted file mode 100644 index 7cab464b8fc4..000000000000 --- a/sys/modules/tests/callout_test/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# - -.PATH: ${SRCTOP}/sys/tests/callout_test - -KMOD= callout_test -SRCS= callout_test.c - -# -# Enable full debugging -# -#CFLAGS += -g - -.include diff --git a/sys/sys/callout.h b/sys/sys/callout.h index 2e2b835fcc43..f2a5bf92ab46 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -81,7 +81,7 @@ */ #define callout_active(c) ((c)->c_flags & CALLOUT_ACTIVE) #define callout_deactivate(c) ((c)->c_flags &= ~CALLOUT_ACTIVE) -#define callout_drain(c) _callout_stop_safe(c, CS_DRAIN, NULL) +#define callout_drain(c) _callout_stop_safe(c, CS_DRAIN) void callout_init(struct callout *, int); void _callout_init_lock(struct callout *, struct lock_object *, int); #define callout_init_mtx(c, mtx, flags) \ @@ -119,11 +119,9 @@ int callout_schedule(struct callout *, int); int callout_schedule_on(struct callout *, int, int); #define callout_schedule_curcpu(c, on_tick) \ callout_schedule_on((c), (on_tick), PCPU_GET(cpuid)) -#define callout_stop(c) _callout_stop_safe(c, 0, NULL) -int _callout_stop_safe(struct callout *, int, void (*)(void *)); +#define callout_stop(c) _callout_stop_safe(c, 0) +int _callout_stop_safe(struct callout *, int); void callout_process(sbintime_t now); -#define callout_async_drain(c, d) \ - _callout_stop_safe(c, 0, d) void callout_when(sbintime_t sbt, sbintime_t precision, int flags, sbintime_t *sbt_res, sbintime_t *prec_res); #endif diff --git a/sys/tests/callout_test.h b/sys/tests/callout_test.h deleted file mode 100644 index 60a02f0c7b56..000000000000 --- a/sys/tests/callout_test.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __callout_test_h__ -#define __callout_test_h__ -/*- - * Copyright (c) 2015 Netflix, Inc. - * - * 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 REGENTS 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 REGENTS 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. - * - */ -struct callout_test { - int number_of_callouts; - int test_number; -}; -#endif diff --git a/sys/tests/callout_test/callout_test.c b/sys/tests/callout_test/callout_test.c deleted file mode 100644 index 059d6a728fb6..000000000000 --- a/sys/tests/callout_test/callout_test.c +++ /dev/null @@ -1,282 +0,0 @@ -/*- - * Copyright (c) 2015 Netflix, Inc. - * - * 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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -MALLOC_DEFINE(M_CALLTMP, "Temp callout Memory", "CalloutTest"); - -struct callout_run { - struct mtx lock; - struct callout *co_array; - int co_test; - int co_number_callouts; - int co_return_npa; - int co_completed; - int callout_waiting; - int drain_calls; - int cnt_zero; - int cnt_one; - int index; -}; - -static struct callout_run *comaster[MAXCPU]; - -uint64_t callout_total = 0; - -static void execute_the_co_test(struct callout_run *rn); - -static void -co_saydone(void *arg) -{ - struct callout_run *rn; - - rn = (struct callout_run *)arg; - printf("The callout test is now complete for thread %d\n", - rn->index); - printf("number_callouts:%d\n", - rn->co_number_callouts); - printf("Callouts that bailed (Not PENDING or ACTIVE cleared):%d\n", - rn->co_return_npa); - printf("Callouts that completed:%d\n", rn->co_completed); - printf("Drain calls:%d\n", rn->drain_calls); - printf("Zero returns:%d non-zero:%d\n", - rn->cnt_zero, - rn->cnt_one); - -} - -static void -drainit(void *arg) -{ - struct callout_run *rn; - - rn = (struct callout_run *)arg; - mtx_lock(&rn->lock); - rn->drain_calls++; - mtx_unlock(&rn->lock); -} - -static void -test_callout(void *arg) -{ - struct callout_run *rn; - int cpu; - - critical_enter(); - cpu = curcpu; - critical_exit(); - rn = (struct callout_run *)arg; - atomic_add_int(&rn->callout_waiting, 1); - mtx_lock(&rn->lock); - if (callout_pending(&rn->co_array[cpu]) || - !callout_active(&rn->co_array[cpu])) { - rn->co_return_npa++; - atomic_subtract_int(&rn->callout_waiting, 1); - mtx_unlock(&rn->lock); - return; - } - callout_deactivate(&rn->co_array[cpu]); - rn->co_completed++; - mtx_unlock(&rn->lock); - atomic_subtract_int(&rn->callout_waiting, 1); -} - -void -execute_the_co_test(struct callout_run *rn) -{ - int i, ret, cpu; - uint32_t tk_s, tk_e, tk_d; - - mtx_lock(&rn->lock); - rn->callout_waiting = 0; - for (i = 0; i < rn->co_number_callouts; i++) { - if (rn->co_test == 1) { - /* start all on spread out cpu's */ - cpu = i % mp_ncpus; - callout_reset_sbt_on(&rn->co_array[i], 3, 0, test_callout, rn, - cpu, 0); - } else { - /* Start all on the same CPU */ - callout_reset_sbt_on(&rn->co_array[i], 3, 0, test_callout, rn, - rn->index, 0); - } - } - tk_s = ticks; - while (rn->callout_waiting != rn->co_number_callouts) { - cpu_spinwait(); - tk_e = ticks; - tk_d = tk_e - tk_s; - if (tk_d > 100) { - break; - } - } - /* OK everyone is waiting and we have the lock */ - for (i = 0; i < rn->co_number_callouts; i++) { - ret = callout_async_drain(&rn->co_array[i], drainit); - if (ret) { - rn->cnt_one++; - } else { - rn->cnt_zero++; - } - } - rn->callout_waiting -= rn->cnt_one; - mtx_unlock(&rn->lock); - /* Now wait until all are done */ - tk_s = ticks; - while (rn->callout_waiting > 0) { - cpu_spinwait(); - tk_e = ticks; - tk_d = tk_e - tk_s; - if (tk_d > 100) { - break; - } - } - co_saydone((void *)rn); -} - - -static void -run_callout_test(struct kern_test *test) -{ - struct callout_test *u; - size_t sz; - int i; - struct callout_run *rn; - int index = test->tot_threads_running; - - u = (struct callout_test *)test->test_options; - if (comaster[index] == NULL) { - rn = comaster[index] = malloc(sizeof(struct callout_run), M_CALLTMP, M_WAITOK); - memset(comaster[index], 0, sizeof(struct callout_run)); - mtx_init(&rn->lock, "callouttest", NULL, MTX_DUPOK); - rn->index = index; - } else { - rn = comaster[index]; - rn->co_number_callouts = rn->co_return_npa = 0; - rn->co_completed = rn->callout_waiting = 0; - rn->drain_calls = rn->cnt_zero = rn->cnt_one = 0; - if (rn->co_array) { - free(rn->co_array, M_CALLTMP); - rn->co_array = NULL; - } - } - rn->co_number_callouts = u->number_of_callouts; - rn->co_test = u->test_number; - sz = sizeof(struct callout) * rn->co_number_callouts; - rn->co_array = malloc(sz, M_CALLTMP, M_WAITOK); - for (i = 0; i < rn->co_number_callouts; i++) { - callout_init(&rn->co_array[i], CALLOUT_MPSAFE); - } - execute_the_co_test(rn); -} - -int callout_test_is_loaded = 0; - -static void -cocleanup(void) -{ - int i; - - for (i = 0; i < MAXCPU; i++) { - if (comaster[i]) { - if (comaster[i]->co_array) { - free(comaster[i]->co_array, M_CALLTMP); - comaster[i]->co_array = NULL; - } - free(comaster[i], M_CALLTMP); - comaster[i] = NULL; - } - } -} - -static int -callout_test_modevent(module_t mod, int type, void *data) -{ - int err = 0; - - switch (type) { - case MOD_LOAD: - err = kern_testframework_register("callout_test", - run_callout_test); - if (err) { - printf("Can't load callout_test err:%d returned\n", - err); - } else { - memset(comaster, 0, sizeof(comaster)); - callout_test_is_loaded = 1; - } - break; - case MOD_QUIESCE: - err = kern_testframework_deregister("callout_test"); - if (err == 0) { - callout_test_is_loaded = 0; - cocleanup(); - } - break; - case MOD_UNLOAD: - if (callout_test_is_loaded) { - err = kern_testframework_deregister("callout_test"); - if (err == 0) { - cocleanup(); - callout_test_is_loaded = 0; - } - } - break; - default: - return (EOPNOTSUPP); - } - return (err); -} - -static moduledata_t callout_test_mod = { - .name = "callout_test", - .evhand = callout_test_modevent, - .priv = 0 -}; - -MODULE_DEPEND(callout_test, kern_testframework, 1, 1, 1); -DECLARE_MODULE(callout_test, callout_test_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); From nobody Wed Jan 24 17:51:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKs3M0msKz58RGd; Wed, 24 Jan 2024 17:51: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 4TKs3M0FFbz54fH; Wed, 24 Jan 2024 17:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706118719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRBEl3M3sQpt2dKDSAEcbg/lSLknXYEc/i/cQuhh9bQ=; b=SZEHPoBg1RkjM6qkRgOkY88SM/7psWABTIub1n4MP+/dLp26r0kn54KTj/6OGlX69sP0TL Kou3YNcbondU27ojEQW8HzOvQ3RdWuvXRC7sAmpt9zjkw9FMCFsjzJ3g0cNmy3kYHa/YdB hiF2pgBWUQqWXEYOwDL69q6WR1o43VoEsiWdpChow8aYzqaQj6zLrMLoIAE0iPbx7XH0RT 97ilwbgET0mEUvxOt4UABtQS879sizuVBmpXuzdozsRSDnLrdSwtee1FEWmsQ9z9nxj/wN x3h12JoWd/aYi9RZ/OdvB6Ef/m6saOaGsixwr/sRBeagqReXxPaoH6HRuRaj9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706118719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRBEl3M3sQpt2dKDSAEcbg/lSLknXYEc/i/cQuhh9bQ=; b=EW6xivQbTTrcGjbgv6gZPWVKLKPUtHw5Igx8Rze0hn82fVNlOMjKng1mckCvIK1K3J+8FF 6lAcB51fr6+QR69X4xTCDF3obQ/OWJgnmTWzuMqMDvBgwNhGarPbqC7PHE3Y0sWf31+bDq fgczvEhg8rLuI936RhGw2Vec20i+JMkabUdGd/P2JyVYh2VXG8Zg/Y0CO6KL/76nbtCRv8 hpcZDUnCyBiFtMaYzGPz3bkKBFF7xQKm014XQmfRxYOpXTMhsT73xnbBnJePnyedxkmRsT CmUcjfyjVFBHpC6G7mzRAkGP4cyi1aPnTnYExQda2j9lyZdi3sXW9qZurHccNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706118719; a=rsa-sha256; cv=none; b=cs9NbMfqmfWISPf14t9uSzZ5gFN2IR5yc98z5Fxq8vCqYR/zBHM0q2e6D0rO8HgCk86YWG S8N02noLLsjecKo5RBKlsiXLmfapbfPR2A1svGwBZKM5X6PrbeY/cwzywcxyVVN2RcC1R+ aLUpIA8oF4/f5UKdVTDksxYRCl25/QBA57JmU0mb0oVgIrvA+RWJfMyFD1WnBfqf8TR8F7 g7wTthNvyNJ+xRbvi9v0apPeWGbNUQjdc0PJk9MET0I+eIghIuNEN3kNRpn1GSnGAMLlXc /6dJAOwOF/8UHfheKOrYrEvuvenMKQJdGMBA++Upb3kipRiOyvgMT26+92hEGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKs3L67YnzNPM; Wed, 24 Jan 2024 17:51: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 40OHpwj7018463; Wed, 24 Jan 2024 17:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OHpwWL018460; Wed, 24 Jan 2024 17:51:58 GMT (envelope-from git) Date: Wed, 24 Jan 2024 17:51:58 GMT Message-Id: <202401241751.40OHpwWL018460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a3ed434a69c9 - main - ccdconfig: remove obsolete references to BSD disklabels List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3ed434a69c903fa58ef001c11c9466166d67c92 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a3ed434a69c903fa58ef001c11c9466166d67c92 commit a3ed434a69c903fa58ef001c11c9466166d67c92 Author: Ed Maste AuthorDate: 2024-01-24 15:05:09 +0000 Commit: Ed Maste CommitDate: 2024-01-24 17:51:45 +0000 ccdconfig: remove obsolete references to BSD disklabels ccd(4) previoulsy had knowledge of BSD disklabels, and relied on their use on the underlying disks, but this hasn't been the case since 2003 (commit 0f76d6d822f4). Remove disklabel references from the man page. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43574 --- sbin/ccdconfig/ccdconfig.8 | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8 index 2c7460f291f6..4014a36b0771 100644 --- a/sbin/ccdconfig/ccdconfig.8 +++ b/sbin/ccdconfig/ccdconfig.8 @@ -27,7 +27,7 @@ .\" .\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $ .\" -.Dd March 17, 2022 +.Dd January 24, 2024 .Dt CCDCONFIG 8 .Os .Sh NAME @@ -122,13 +122,6 @@ argument is optional. ccd0 16 none /dev/da2s1 /dev/da3s1 .Ed .Pp -The component devices need to name partitions of type -.Li FS_BSDFFS -(or -.Dq 4.2BSD -as shown by -.Xr disklabel 8 ) . -.Pp If you want to use the .Tn Linux .Xr md 4 @@ -187,30 +180,6 @@ When you create a new ccd disk you generally want to and .Xr disklabel 8 it before doing anything else. -Once you create the initial label you can -edit it, adding additional partitions. -The label itself takes up the first -16 sectors of the ccd disk. -If all you are doing is creating file systems -with newfs, you do not have to worry about this as newfs will skip the -label area. -However, if you intend to -.Xr dd 1 -to or from a ccd partition it is usually a good idea to construct the -partition such that it does not overlap the label area. -For example, if -you have A ccd disk with 10000 sectors you might create a 'd' partition -with offset 16 and size 9984. -.Bd -literal -# disklabel ccd0 > /tmp/disklabel.ccd0 -# disklabel -R ccd0 /tmp/disklabel.ccd0 -# disklabel -e ccd0 -.Ed -.Pp -The disklabeling of a ccd disk is usually a one-time affair. -If you reboot the machine and reconfigure the ccd disk, -the disklabel you -had created before will still be there and not require reinitialization. Beware that changing any ccd parameters: interleave, flags, or the device list making up the ccd disk, will usually destroy any prior data on that ccd disk. @@ -246,12 +215,3 @@ The .Nm utility first appeared in .Nx 1.1 . -.Sh BUGS -The initial disklabel returned by -.Xr ccd 4 -specifies only 3 partitions. -One needs to change the number of partitions to 8 using -.Dq Nm disklabel Fl e -to get the usual -.Bx -expectations. From nobody Wed Jan 24 18:09:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKsR96MBQz58SwX; Wed, 24 Jan 2024 18:09: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 4TKsR95hXDz57K9; Wed, 24 Jan 2024 18:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706119749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ENMwg8zWsXo68/8Sdc6kfWyRv0DC37PW2LJJMRU3S+g=; b=IVfl00t9/gJByZ0K3ZbKrcz0KkixzQOGN/XKJog8M3KQy/c9dAId1AzQ03He812hWw6+XH SV24MBSoReWQ7U1gyib3kFSbApAD9XULxJDE54gh0N9VAVefspLBY2Br2weQ9k5IpnzNxU 3J5EueIbAM5Yev4Gwb5puRW2de1cJWLvagebS4JMxFhMW4eF0NZlkMXzHeJhWLRq2W9L19 YB2Y+cUzB6BEYZq3DX+9rSOidyO/LUgnCc5xXjRTvfDzsEPckytO7dv8LiCHBr+oJfMiXY HFWqE6q7Gpwodnfrv8s5cKK9PNtE/SLcMtQCWewTFHzgxLZVBIpOt51e8Q/xvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706119749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ENMwg8zWsXo68/8Sdc6kfWyRv0DC37PW2LJJMRU3S+g=; b=nvEl12umUEFkFLfTugAkPsNa9vQ8XUhw2ZlkoPHy/lpMtovcY/EIfpgm1LHgUaDZj/m7sp wj4T5aoOYCX+4FFO/VLf9pvPgwU+krS4DOoeaiHL+WxpdB9eEyzn5eA4zC9iVDwnPObKWa L+0vy67jpPhTBdb6pTm9oqVuztGX2AtOr/3tVu0io/fyjvcYpDridgYN8974VJj7Ow7+Gb tEQj5f+hWs/f+fuMTUhE80IRMoaJMclxoSUjMvdKHxphOYV0hpA2HigOKXV6nmm0wOcYL5 AWo39T1aTs8YvAX1ZCRhO8I9cIcd8hRTDqyRK6CtiAtTfLCTKKso0p6O/tQ4EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706119749; a=rsa-sha256; cv=none; b=GcQw3l/FewY6hluR+57TGGdCe/JpJOIA0P/SvYASARIIb24WWTRCGdocpVDROIaerDkcRT 84TlKkCsg8qqHSgOAqkUZVjG8jNEl6agVqnGloYPpKsjkpLoUFN0bEAAJgyr1LWYLbq5KO ZeV7PsGoE8OmF8yExhF6oX8LGxRxB+vR8vx612X6VcCLW1brPoSTN/azVWAlKFusvbHZKI riOAY8CVhi0NcHJQLiY3T5mQGyXHCBmWpJTfmnkcO7P+C0KupQ/f8rpJ64+PknU3jkuk/A 0dJwF/hbsARX6l8ewofGfm2EM5lx9TErO0N/TJ+6LN4i2yFbHKTYdejAwoIHEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKsR94fq9zPj5; Wed, 24 Jan 2024 18:09: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 40OI99hu038214; Wed, 24 Jan 2024 18:09:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OI9908038211; Wed, 24 Jan 2024 18:09:09 GMT (envelope-from git) Date: Wed, 24 Jan 2024 18:09:09 GMT Message-Id: <202401241809.40OI9908038211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f1c0030bb05c - main - pf: only check MTU for IPv6 packets when forwarding List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1c0030bb05cfa01bdd500e50befbb425fecc4c4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f1c0030bb05cfa01bdd500e50befbb425fecc4c4 commit f1c0030bb05cfa01bdd500e50befbb425fecc4c4 Author: Kristof Provost AuthorDate: 2024-01-24 16:34:01 +0000 Commit: Kristof Provost CommitDate: 2024-01-24 18:08:29 +0000 pf: only check MTU for IPv6 packets when forwarding When the packets are generated locally (i.e. PFIL_FWD is not set) we might generate overly large packets and rely on the NIC to fragment it for us. In that case we'd reject a valid packet. Reported by: Herbert J. Skuhra Tested by: Herbert J. Skuhra Fixes: 54c62e3e5d8cd90c5571a1d4c8c5f062d580480e Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 38a5a45d7991..2dc6d02d330a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8515,7 +8515,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb * confused and fail to send the icmp6 packet too big error. Just send * it here, before we do any NAT. */ - if (dir == PF_OUT && IN6_LINKMTU(ifp) < pf_max_frag_size(m)) { + if (dir == PF_OUT && pflags & PFIL_FWD && IN6_LINKMTU(ifp) < pf_max_frag_size(m)) { PF_RULES_RUNLOCK(); *m0 = NULL; icmp6_error(m, ICMP6_PACKET_TOO_BIG, 0, IN6_LINKMTU(ifp)); From nobody Wed Jan 24 19:13:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKts661SWz58YPg for ; Wed, 24 Jan 2024 19:13: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 4TKts65SbQz41Mb; Wed, 24 Jan 2024 19:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706123594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eZ2QEaVD8uB7vnkrof5rx7yaXZYYFiLxrOJWJMqdXCQ=; b=bA/l7/8ESxOiB6i/uFjs5uBsfeK38ekpaEOL1ox7y4z9yEz3DxyMySoo0N04xkBM/h2VE/ 8jvDsYDmWI9vavz0WTUlpB/ugiyJGTMHminLP7JQLNFc3E4yTh15WiLYiPn/CwpHb8DSi3 hAsB6pLynQpwf9AMwUAsquJ7UJ3JFhjl2+FurX8iIOqllPFh0YOnHDPGbLjWi8wbZKZBVu ouVG9TCgBIOdZn1tPuWJPylTNRuzCrahrCGdum14XYBNgWajVx8gdSUJlaUw2LgayC7tMO BY9DmURuClBF7IPRD6DiJdUrkGAOjLQMHtFqA+ZAoK2TaxoT+YDc1CqOTrzxIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706123594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eZ2QEaVD8uB7vnkrof5rx7yaXZYYFiLxrOJWJMqdXCQ=; b=PNB8iHfGXTO/iJa6EZ5qZZwkgbOvk9cTzK03lwWovEIxRCgEYGVJGq1dk5gN4a2oSjyKht QUVpFYyumtBl+UOKPM8bmdYhPu1gRJBrEvUI8ULekYGImIvYQ3YIOuC+/SfUnY+X6D+kwU 1/OvjLhIGYHGgpsJQ9tfhsi/iO4NLW6hxWBbwQdMBbcTBlNrvNGA+N8ofAOs2J6bAzax1A o297NWZzGZPMG8LZWjEZWwj6O57mzZIr3ygpNLy1KlySa6VaiXPfkGtSJFqD08CK2M7Rk8 qQ4qcwSj9eZED7G8VPRIjVjzyDvGYdQtOQXDNLNA2IvnJPt6ZxiPL/EPF5XOUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706123594; a=rsa-sha256; cv=none; b=iyA2ORIov50pP6zR1rZTiVAtqYfHlSCMEyvuzEEdruyJ8eH8ZJquab+h5YyFNX0u5gSdOK d5GFc/5xix7g41z6LI6sUmFGTgOJS+WJYB7NBKRs2AjJanVsc4OGjicDejHI1jf63odES7 1V0ODZddUAAodO3NfcnJkyYk2eD6MWjZv1kcA39hEHuJPNgTXQWPv61oBWOw/iKmaMviD2 785qfx3akAbXh2+nWl3pADj4ACSRvnNJIXxJJiVSwExOvZ8A8+PMpSJi/DUF+w2sLwW+k6 K9qA3W9P6kWhzGYH2TibLp2GJC48GCu0p46NuMKfyct4UYJzeCCuY5UeQ5wTuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKts64BwgzRMV; Wed, 24 Jan 2024 19:13: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 40OJDE6P054285; Wed, 24 Jan 2024 19:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJDEGN054284; Wed, 24 Jan 2024 19:13:14 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:13:14 GMT Message-Id: <202401241913.40OJDEGN054284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 950076cd18f3..4df029cc74e5 - vendor/llvm-project/main - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/main X-Git-Reftype: branch X-Git-Commit: 4df029cc74e5ec124f14a5682e44999ce4f086df X-Git-Oldrev: 950076cd18f3fa9d789b4add9d405898efff09a5 X-Git-Newrev: 4df029cc74e5ec124f14a5682e44999ce4f086df Auto-Submitted: auto-generated The branch vendor/llvm-project/main has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=950076cd18f3..4df029cc74e5 4df029cc74e5 Vendor import of llvm-project main llvmorg-18-init-18359-g93248729cfae, the last commit before the upstream release/18.x branch was created. From nobody Wed Jan 24 19:13:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKts664sZz58YMK for ; Wed, 24 Jan 2024 19:13: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 4TKts65d6mz41Bp; Wed, 24 Jan 2024 19:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706123594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPh9WX/azk3EYrigTBoegp5KMD/DCeH5lTDd/a0y1ls=; b=bhE9QJQm0qvy3GSuhlpVc2OD3XRL+Ja1YzX9ODJ87GwwK3ZgfPu9oxkG9LEeAQT9d1xdK4 Fver1xdhlZpd0a+xrBTijHog+qoX5TlzoBdCgDIuekd3pfe0bsGy1o321nL06i1hq5Vm/9 Vzqf+ktic6Vvxy+2B5jeltrwUCrevZC4UkSd49T1AZ4XoBjfzQtMhN7UgmrZ38nfyOEOp8 4fJqsDXlpESYZ4sUHgQpiC4RuBg5VNyddgzVAjl8Eod2G0eVO+mgbvca5ydvP1hoMMZQyx nS1EVhUJgrdehPMTm2sABg1CdX5kjQbR2xd/4MtD/+7Ut+yxH7QW9o3pUOD5Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706123594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPh9WX/azk3EYrigTBoegp5KMD/DCeH5lTDd/a0y1ls=; b=HvqQXsnjxT7jHNGeo4OfyDj+4XttJd/EGsnf731u0tAjdkPY/0Nt6NU/Aw4adcXghF4xDG R5o4q7REcDkM8WhfA0crnrvZ9ocLZAmiKDtpZTZwIyDbF9mXlu8vGjwiBg+5He7uXOj60K kb3p7eKlOi2uDFTiQlk/A17REQ02pCfR3fiSJBF0JpX9GVBfjAvRQtwfNEngp5JAh/6NDz TGXdqzPw2A4bwPYrbVfUnDH5dCuFZ/j3DENoXoSaBC8kAdG/+8VkZN6VrI/8Qy9H1p61GW RzWx1DYdlBsmdWXwUWdd3mQ5bcHmwQpkIDV0sfjPrOYGy2dITCqIQxCHDWNQCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706123594; a=rsa-sha256; cv=none; b=r0chZRNSV5Y+8xfN66HrKfIIlHF40Tk/jMZ5KSn5JdeijSvkraVfI3iIVpZFf/N/968DaF XIzLgiyT39xdaFLHeBHw29Ynu5U3FBjKFUSsNhB3nq3Dj+0abjVQZHFHdxHTg5EhkIu4cq s7VRh8It+i7Zku7vjK0CAQp+YhmV1dqkUuVwQb/nWBRRBgH9B7mFsmpwAGr6hjDok9x4rM D5nkrCVQXLzlKPlzDyxYCH+hFi0QsHOQiZ6wsGMM9GNRt/HRDY5mtIdan6SqQbQkkRPxJC 70YEqN/EadRqUbcDgD8AcX/EDcluxsCVNbfAzKQvfbwSiEiB7Cx4xjn9ZOLv9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKts64hFbzR2y; Wed, 24 Jan 2024 19:13: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 40OJDEuL054304; Wed, 24 Jan 2024 19:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJDEZW054303; Wed, 24 Jan 2024 19:13:14 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:13:14 GMT Message-Id: <202401241913.40OJDEZW054303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 20c40b91b9b4 - Create tag vendor/llvm-project/llvmorg-18-init-18359-g93248729cfae List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/llvm-project/llvmorg-18-init-18359-g93248729cfae X-Git-Reftype: annotated tag X-Git-Commit: 20c40b91b9b43e7cb0ebe6afd0bcb60be4cf35c5 Auto-Submitted: auto-generated The annotated tag vendor/llvm-project/llvmorg-18-init-18359-g93248729cfae has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-18-init-18359-g93248729cfae tag vendor/llvm-project/llvmorg-18-init-18359-g93248729cfae Tagger: Dimitry Andric TaggerDate: 2024-01-24 19:12:37 +0000 Tag llvm-project main llvmorg-18-init-18359-g93248729cfae, the last commit before the upstream release/18.x branch was created. commit 4df029cc74e5ec124f14a5682e44999ce4f086df Author: Dimitry Andric AuthorDate: 2024-01-24 19:11:41 +0000 Commit: Dimitry Andric CommitDate: 2024-01-24 19:11:41 +0000 Vendor import of llvm-project main llvmorg-18-init-18359-g93248729cfae, the last commit before the upstream release/18.x branch was created. From nobody Wed Jan 24 19:36:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvNQ0tMhz58ZrQ; Wed, 24 Jan 2024 19:36: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 4TKvNQ09Fzz44N2; Wed, 24 Jan 2024 19:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2zdc27Yv9qJuE+zcArYFhg71b3MoJybpNs/ajh4lbs=; b=ZFD8LVzTQmQd+Orz7gTKeL0oGfnW4cpCyNgQZ6CPjfrszw5WmtlYVEBTEOFYVyRVZLL9+x i/xDgzevulB+Zf6ZruzaYC1xaZqmTMNHHXIGlfj1MzA7oyG0en+alinGhQWRqBxbuFGaxY GF0oSK/NhAn2krxJ11fkogt8SZhqGhiq5OcbN3nnKGkd93e/Q8AIl06PucspKmDI5RI2NZ txOUjLoI6yGw16A/il0aohfNSipGaiEa7OGnqexbTOPMmi1E+HAlAGJgGkYqKwBU6YGcd4 rl8GOklahmTpA3kn+IonY9evZ41f0J/sNgws+YywnFbZAg9mj+Axaak0UvnKzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2zdc27Yv9qJuE+zcArYFhg71b3MoJybpNs/ajh4lbs=; b=xXvUBBYKDxhxglrCmWB78Qe/eK/btvxofbw32TJIOOWZrmohh4/hFJn5BCWJVS7L/t88JG NLVhlOwoHCWSKrHA9cSi8am7TmTXaeDaA3/2lMJ+ho7lDQ8GcQgME5hXFONeurkP1lfaqp WO75jmGduWjQkoFS4n8H4GKDFwJ1/jQA9ockigBlj+WixU+LkiifNNTR9enX2Qd1zARcTA K+epSmhfEvU44EzjAlmcGpt8JWArnVYy1mHOkLIGpO1cwY0qEg+xakhjf1UDhPnUbzdoTA dKpN1kQqn0tGCeQ2R4satmCBwgt+3IEMwhQqmPmq0NhK5vWhD2Qnuuedjm+8uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125014; a=rsa-sha256; cv=none; b=QeFUu3bSZoagh1ei6GytxbGRHKJP9VOEvV3v7xFysfzfyMPNTFTDAjBixJrkXczvfTGiqT BjhTOjMs9vcOud5qXAmZfIE6lGhigFXH8/jTPxY+CU4L+Rkf6oMIAXM968AwjzEyxERQWU QCIjYWFfbdyj62WnbshRou+Ud5/saNBRuTWftDf9zoPR9uSkqrvxpD9VHd2SBuErbShZF1 ZyfIWCIEOtOT+uJN+nCO7JGB8KJ0IQimUyQJMQ1jbgt9ZU1c7ylK+o3jFkDrOJvP7sWWB3 2yMClVczOd9AgrLSxAgun9NUqf9wJEDEqO688qucMex71uszqsAvGX+GQGpB1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvNP6KmGzRXh; Wed, 24 Jan 2024 19:36: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 40OJarSF088568; Wed, 24 Jan 2024 19:36:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJarnb088565; Wed, 24 Jan 2024 19:36:53 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:36:53 GMT Message-Id: <202401241936.40OJarnb088565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 8b82f36f8903 - main - pflowctl: fix usage message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b82f36f890391e063ad64746ec612aeabfc2c41 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8b82f36f890391e063ad64746ec612aeabfc2c41 commit 8b82f36f890391e063ad64746ec612aeabfc2c41 Author: Kristof Provost AuthorDate: 2024-01-24 19:35:35 +0000 Commit: Kristof Provost CommitDate: 2024-01-24 19:36:32 +0000 pflowctl: fix usage message Reported by: Jim Pingle Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pflowctl/pflowctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pflowctl/pflowctl.c b/sbin/pflowctl/pflowctl.c index 4186598dd9bc..e5dd3df7e6a7 100644 --- a/sbin/pflowctl/pflowctl.c +++ b/sbin/pflowctl/pflowctl.c @@ -53,7 +53,7 @@ static void usage(void) { fprintf(stderr, -"usage: %s [-la] [-d id]\n", +"usage: %s [-lc] [-d id] [-s id ...]\n", __progname); exit(1); From nobody Wed Jan 24 19:44:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvY84h0Bz58bqY; Wed, 24 Jan 2024 19:44: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 4TKvY83xB5z44ym; Wed, 24 Jan 2024 19:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AefrWHx4+YKwckiUJto4mmEKZbFYixD4coM2EmjXCjo=; b=DTyFGLq5RAgdnb8SzlTu9LtRXjS1p9vLuzpR0XrBs2arFLoAtAQCuGqmvN8pFoPoffPeiz gaSKyYW0+2OBJTbIo2+904KcDOzziTufea0aT0aEyDd2LDu0nw1RrdQWoaz4OscJ3uVpr4 3qaQ8Rxfuvey2gvf+ODKt5EcQaFgkKasikzEYcHQiwQy+8Bef4y+BqvhSXZUt0TUUqlHtu 9W1j6OL8GKDAz+YIwdUxujeZbq3cYiuOOlO7qKqGZFLiMrraGzLReJSQiPfwfBNHsFEtNG vL1zsXJBVkWeNB29iJOhfKFDDCVNpYSCVQk3Wo4+ETa/sFmsfKNCgMRXAgI2Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AefrWHx4+YKwckiUJto4mmEKZbFYixD4coM2EmjXCjo=; b=gYDEVibwhmMI12HzU9q1ZrtR2FKa6DbCDXic2w+GS1JJqL97+xz5YposWSMZuOL5rM6zbZ Tz/Ov/Fg3nzw6E/D0yDdrdYywANfLTrhvMKKc9rejBhLTMCZbESZRQKEPVshVtNvovYZyX zL4oW9m2lUTT5xMH6eF+NtpTSaHejPAwTC6kmtdzAP5s/AfQMNi+mNVxAN4Db6A7d6H+vg Uy0NKAD8AxyO2qqpNvHrqURmTlRs/9bc6F3tRQDRb2r7RAd2egT4/VD+i7RjyaQKueC5KU ugYOp1C2Lm/n67sRejkmIOzMgo/YZ6gbmw7tYDUWR9t68oPVjtM30AZJL4eSyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125468; a=rsa-sha256; cv=none; b=JzPVwl/dEtdabWcm5nMSPq6cwPlir/4OyBDtZZsEXjmkxFLj2o1cYAjUzFFZ2VsNyFsTQQ NEweIWldpw+ZYoE0KP2Uov+0A7vRsVhn6lVo7HU/xQ7G9k9ckMcowmD2anEF+LN65Oigf0 6sP2P+97rAbDrc6T0+n7QvjGHCqctUkynmU9AT147ovf1k2fpfdKjTDK7FmT7xKcQiuCTS JvYdG8zO8tYn5rja0limPpsRCpuHpAc+7FWENu+S1Vpty37f+d+SQvDO2ss7yEtk/xNgcT PTqoA/UQOtfzeYiyJjNQHHdtu0fECaHI1bRYMHQdZyHfj7GagOLYvfyOyRr65Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvY82jJBzRgn; Wed, 24 Jan 2024 19:44: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 40OJiS8n004794; Wed, 24 Jan 2024 19:44:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiS8x004791; Wed, 24 Jan 2024 19:44:28 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:28 GMT Message-Id: <202401241944.40OJiS8x004791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 37728967ee5c - stable/14 - lib/libc/amd64/string/strcmp.S: add baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 37728967ee5c845f5af9d22377be10ffb62c90aa Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=37728967ee5c845f5af9d22377be10ffb62c90aa commit 37728967ee5c845f5af9d22377be10ffb62c90aa Author: Robert Clausecker AuthorDate: 2023-09-16 05:29:39 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:24 +0000 lib/libc/amd64/string/strcmp.S: add baseline implementation This is the most complicated one so far. The basic idea is to process the bulk of the string in aligned blocks of 16 bytes such that one string runs ahead and the other runs behind. The string that runs ahead is checked for NUL bytes, the one that runs behind is compared with the corresponding chunk of the string that runs ahead. This trades an extra load per iteration for the very complicated block-reassembly needed in the other implementations (bionic, glibc). On the flip side, we need two code paths depending on the relative alignment of the two buffers. The initial part of the string is compared directly if it is known not to cross a page boundary. Otherwise, a complex slow path to avoid crossing into unmapped memory commences. Performance-wise we beat bionic for misaligned strings (i.e. the strings do not share an alignment offset) and reach comparable performance for aligned strings. glibc is a bit better as it has a special kernel for AVX-512, where this stuff is a bit easier to do. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41971 (cherry picked from commit bca25680b91b3bea7faef615765806a04634eb23) --- lib/libc/amd64/string/strcmp.S | 299 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 292 insertions(+), 7 deletions(-) diff --git a/lib/libc/amd64/string/strcmp.S b/lib/libc/amd64/string/strcmp.S index 437db7eca43a..eb354bd2af82 100644 --- a/lib/libc/amd64/string/strcmp.S +++ b/lib/libc/amd64/string/strcmp.S @@ -1,14 +1,33 @@ -/* - * Written by J.T. Conklin - * Public domain. +/*- + * Copyright (c) 2023, The FreeBSD Foundation + * + * SPDX-License-Expression: BSD-2-Clause + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Adapted from NetBSD's common/lib/libc/arch/x86_64/string/strcmp.S + * written by J.T. Conklin that was originally + * dedicated to the public domain. */ #include +#include + #if 0 RCSID("$NetBSD: strcmp.S,v 1.3 2004/07/19 20:04:41 drochner Exp $") #endif -ENTRY(strcmp) +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + +ARCHFUNCS(strcmp) + ARCHFUNC(strcmp, scalar) + ARCHFUNC(strcmp, baseline) +ENDARCHFUNCS(strcmp) + +ARCHENTRY(strcmp, scalar) /* * Align s1 to word boundary. * Consider unrolling loop? @@ -39,7 +58,7 @@ ENTRY(strcmp) movabsq $0x8080808080808080,%r9 subq $8,%rsi - .align 4 + ALIGN_TEXT .Lword_loop: movq 8(%rdi),%rax addq $8,%rdi @@ -53,7 +72,7 @@ ENTRY(strcmp) testq %r9,%rdx je .Lword_loop - .align 4 + ALIGN_TEXT .Lbyte_loop: movb (%rdi),%al incq %rdi @@ -69,6 +88,272 @@ ENTRY(strcmp) movzbq %dl,%rdx subq %rdx,%rax ret -END(strcmp) +ARCHEND(strcmp, scalar) + +ARCHENTRY(strcmp, baseline) + /* check if either string crosses a page in the head */ + lea 15(%rdi), %r8d # end of head + lea 15(%rsi), %r9d + mov %edi, %eax + mov %esi, %edx + xor %edi, %r8d # bits that changed between first and last byte + xor %esi, %r9d + and $~0xf, %rdi # align heads to 16 bytes + and $~0xf, %rsi + or %r8d, %r9d # in either RSI or RDI + and $0xf, %eax # offset from alignment + and $0xf, %edx + pxor %xmm1, %xmm1 + test $PAGE_SIZE, %r9d # did the page change? + jz 0f # if not, take fast path + + /* heads may cross page boundary, avoid unmapped loads */ + movdqa (%rdi), %xmm0 # load aligned heads + movdqa (%rsi), %xmm2 + mov $-1, %r8d + mov $-1, %r9d + mov %eax, %ecx + shl %cl, %r8d # string head in XMM0 + mov %edx, %ecx + shl %cl, %r9d # string head in XMM2 + movdqa %xmm0, -40(%rsp) # stash copies of the heads on the stack + movdqa %xmm2, -24(%rsp) + pcmpeqb %xmm1, %xmm0 + pcmpeqb %xmm1, %xmm2 + pmovmskb %xmm0, %r10d + pmovmskb %xmm2, %r11d + test %r8d, %r10d # NUL byte present in first string? + lea -40(%rsp), %r8 + cmovz %rdi, %r8 + test %r9d, %r11d # NUL byte present in second string? + lea -24(%rsp), %r9 + cmovz %rsi, %r9 + movdqu (%r8, %rax, 1), %xmm0 # load true (or fake) heads + movdqu (%r9, %rdx, 1), %xmm4 + jmp 1f + +0: movdqu (%rdi, %rax, 1), %xmm0 # load true heads + movdqu (%rsi, %rdx, 1), %xmm4 +1: pxor %xmm2, %xmm2 + pcmpeqb %xmm0, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm4 # which bytes match? + pandn %xmm4, %xmm2 # match and not NUL byte? + pmovmskb %xmm2, %r9d + xor $0xffff, %r9d # mismatch or NUL byte? + jnz .Lhead_mismatch + + /* load head and second chunk */ + movdqa 16(%rdi), %xmm2 # load second chunks + movdqa 16(%rsi), %xmm3 + sub %rdx, %rax # is a&0xf >= b&0xf? + jb .Lswapped # if not, proceed with swapped operands + + neg %rax + movdqu 16(%rsi, %rax, 1), %xmm0 + sub %rdi, %rsi # express RSI as distance from RDI + lea (%rsi, %rax, 1), %rdx # point RDX to offset in second string + neg %rax + pcmpeqb %xmm3, %xmm1 # ... corresponding to RDI + pcmpeqb %xmm2, %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $16, %rdi + test %r8d, %r8d + jnz .Lnul_found + xor $0xffff, %r9d + jnz .Lmismatch + add $16, %rdi # advance aligned pointers + + /* + * During the main loop, the layout of the two strings is something like: + * + * v ------1------ v ------2------ v + * RDI: AAAAAAAAAAAAABBBBBBBBBBBBBBBB... + * RSI: AAAAAAAAAAAAABBBBBBBBBBBBBBBBCCC... + * + * where v indicates the alignment boundaries and corresponding chunks + * of the strings have the same letters. Chunk A has been checked in + * the previous iteration. This iteration, we first check that string + * RSI doesn't end within region 2, then we compare chunk B between the + * two strings. As RSI is known not to hold a NUL byte in regsions 1 + * and 2 at this point, this also ensures that RDI has not ended yet. + */ + ALIGN_TEXT +0: movdqu (%rdi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb (%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_found + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatch + + /* main loop unrolled twice */ + movdqu 16(%rdi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb 16(%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb 16(%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rdi + test %r8d, %r8d + jnz .Lnul_found2 + xor $0xffff, %r9d # any mismatches? + jz 0b + + sub $16, %rdi # roll back second increment + + /* a mismatch has been found between RDX and RSI */ +.Lmismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rdi, %rdx # turn RDX from offset to pointer + movzbl (%rdx, %r9, 1), %ecx + movzbl (%rdi, %r9, 1), %eax + sub %ecx, %eax # difference of the mismatching chars + ret + + /* mismatch in true heads */ +.Lhead_mismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rax, %rdi # return to true heads + add %rdx, %rsi + movzbl (%rdi, %r9, 1), %eax # mismatching characters + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax + ret + +.Lnul_found2: + sub $16, %rdi # roll back second increment + + /* a NUL has been found in RSI */ +.Lnul_found: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8w # adjust NUL mask to positions in RDI/RDX + xor $0xffff, %r9d # mask of mismatches + or %r8d, %r9d # NUL bytes also count as mismatches + jnz .Lmismatch + + /* + * (RDI) == (RSI) and NUL is past the string. + * Compare (RSI) with the corresponding part + * of the other string until the NUL byte. + */ + movdqu (%rdi, %rax, 1), %xmm0 + pcmpeqb (%rdi, %rsi, 1), %xmm0 + add %rdi, %rsi # restore RSI pointer + add %rax, %rdi # point RDI to chunk corresponding to (RSI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + ret + + /* + * If (a&0xf) < (b&0xf), we do the same thing but with swapped + * operands. I found that this performs slightly better than + * using conditional moves to do the swap branchless. + */ +.Lswapped: + movdqu 16(%rdi, %rax, 1), %xmm0 + sub %rsi, %rdi # express RDI as distance from RSI + lea (%rdi, %rax, 1), %rdx # point RDX to offset in RDI corresponding to RSI + neg %rax # make difference positive + pcmpeqb %xmm2, %xmm1 + pcmpeqb %xmm3, %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $16, %rsi # advance aligned pointers + test %r8d, %r8d + jnz .Lnul_founds + xor $0xffff, %r9d + jnz .Lmismatchs + add $16, %rsi + + /* + * During the main loop, the layout of the two strings is something like: + * + * v ------1------ v ------2------ v + * RDI: AAAAAAAAAAAAABBBBBBBBBBBBBBBB... + * RSI: AAAAAAAAAAAAABBBBBBBBBBBBBBBBCCC... + * + * where v indicates the alignment boundaries and corresponding chunks + * of the strings have the same letters. Chunk A has been checked in + * the previous iteration. This iteration, we first check that string + * RSI doesn't end within region 2, then we compare chunk B between the + * two strings. As RSI is known not to hold a NUL byte in regsions 1 + * and 2 at this point, this also ensures that RDI has not ended yet. + */ + ALIGN_TEXT +0: movdqu (%rsi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb (%rsi, %rdi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_founds + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatchs + + /* main loop unrolled twice */ + movdqu 16(%rsi, %rdx, 1), %xmm0 # chunk of 2nd string corresponding to RDI? + pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi, %rdi, 1), %xmm1 # end of string in RSI? + pcmpeqb 16(%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rsi + test %r8d, %r8d + jnz .Lnul_found2s + xor $0xffff, %r9d # any mismatches? + jz 0b + + sub $16, %rsi # roll back second increment + + /* a mismatch has been found between RDX and RDI */ +.Lmismatchs: + tzcnt %r9d, %r9d # where is the mismatch? + add %rsi, %rdx # turn RDX from offset to pointer + movzbl (%rdx, %r9, 1), %eax + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax # difference of the mismatching chars + ret + +.Lnul_found2s: + sub $16, %rsi # roll back second increment + + /* a NUL has been found in RSI */ +.Lnul_founds: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8w # adjust NUL mask to positions in RDI/RDX + xor $0xffff, %r9d # mask of mismatches + or %r8d, %r9d # NUL bytes also count as mismatches + jnz .Lmismatchs + + /* + * (RDI) == (RSI) and NUL is past the string. + * Compare (RSI) with the corresponding part + * of the other string until the NUL byte. + */ + movdqu (%rsi, %rax, 1), %xmm0 + pcmpeqb (%rsi, %rdi, 1), %xmm0 + add %rsi, %rdi # restore RDI pointer + add %rax, %rsi # point RSI to chunk corresponding to (RDI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + ret +ARCHEND(strcmp, baseline) .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvY95RsFz58bdD; Wed, 24 Jan 2024 19:44: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 4TKvY94cMxz45LL; Wed, 24 Jan 2024 19:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8V8OwaIULZ0RVCXhwhKvRqVPeoTQDhj9g/lIYjn8Rk=; b=hFGZQdlckii6As9/3sIEDzyo7uQekx0RUw+om7bKfyqYNXMrs4/8OvBHPH/Qtr81JiZEbq dsh/ZN4aUWWQKOa9SDcNiJOMueJ1h1wVnbYxg/Q1Ojv9Wx2ePFIS3bzuk4tLAZXoVTwfOf mWbznvsyNbw/DbP5pxrngEiroCKSUMbAR/ARiVbp5Lr6gAvIqv0ief0QDG6AHuVdXrXRWS qe9PLVWaYLXgO0p3qfY0Lv8R63+XkcARvI51BsRrVGjzG0QteSB6GiWjN9XTtaCCmB6S9C JG8xu1+oEjjv13Ra7iZAjDE5QnVo5ENc8NSD8xSHQlmWuL483nxQHT8NfVmqpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8V8OwaIULZ0RVCXhwhKvRqVPeoTQDhj9g/lIYjn8Rk=; b=Ndcf1+KjnfnbgSIqG5DIWdgROZdYC5AsuqGYcqTerRTlE9xLMhq3LadEXPmb50zWlT6pWB JrEQTA38jKaRFBBoZfF0S8EaNfpwFijrgQ2wT88h8E0mCbVcCG2opjxaujLhvVbPdv+Q+6 j2b71BrMgRFslONqBfmwQdNp3kVZ90NQXEb6WIMqVwluli6LO2Ldd8aNFWb3Bo3BgHn6Gw yn+L76UD2Nfg6X3KHF81KyYfrPzwqYBUIajrzWUePWMBM7gS7wvlKUrUBr7a7lVRSWFZUz CsO+7i4uqx/jfdZ0ROICA/stXn/Qal3UQE3d9Be6zlZV2mrZrQHQiFKN5H4dqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125469; a=rsa-sha256; cv=none; b=Ezeax2CiFYwQKWwrnTJngUMYpC6IKvUS8zQEnRJXfXY0l+aj2ul7htcCtS4cvRFVqRfbDy G+obcZzz0oHhF8qotfiwZ8P5BfI2nRzBr4Lv1h1lZxJl5JVAH4Qwp0+5x/xgtqcjv/MaKe V490dV+/8koo0Y+jhNHMByCBwribdz6zZ1DwuSjeNTrmZpa98xAGfuKP/KCAbY3kbAgwmi aX0uNWVEBGv14M/KPanLSlPdAKhaanKb8tJCqTgpf6MzEauLOOLSiZJ+bQ7hUuHFhXIIF3 B8oEzqrogfopUUMzqTyKfto01Rmnqwf+JstaLTK2Ot7zuFKhq6VtbdrfDl0ZuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvY93ghMzSFL; Wed, 24 Jan 2024 19:44: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 40OJiTKP004846; Wed, 24 Jan 2024 19:44:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiTdm004843; Wed, 24 Jan 2024 19:44:29 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:29 GMT Message-Id: <202401241944.40OJiTdm004843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: d5782dbd011c - stable/14 - share/man/man7/simd.7: document new amd64 baseline strcmp() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d5782dbd011ca338a9da4c8d663c6897af7859e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d5782dbd011ca338a9da4c8d663c6897af7859e1 commit d5782dbd011ca338a9da4c8d663c6897af7859e1 Author: Robert Clausecker AuthorDate: 2023-09-25 06:18:06 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:24 +0000 share/man/man7/simd.7: document new amd64 baseline strcmp() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41971 (cherry picked from commit 47adb1e012643b8f32f6cf8c84cd50eb58f0f17a) --- share/man/man7/simd.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 3fd8890c4f53..fc91ded85698 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd September 2, 2023 +.Dd September 25, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -68,7 +68,7 @@ Enhanced functions are present in the following architectures: .It strcat Ta Ta Ta S Ta S .It strchr Ta S Ta Ta S1 Ta S .It strchrnul Ta Ta Ta S1 -.It strcmp Ta Ta S Ta S Ta S +.It strcmp Ta Ta S Ta S1 Ta S .It strcpy Ta Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 .It strlen Ta Ta S Ta S1 From nobody Wed Jan 24 19:44:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYC05bSz58bY9; Wed, 24 Jan 2024 19:44: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 4TKvYB61kTz45LY; Wed, 24 Jan 2024 19:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JRNnz3DcSsS/vAnCfMtyhZbmFg/4iKKA29VR1nqd48k=; b=ZPbrOG8p+K0nrsrq7uPFv4flZ+KX835utNL2UsfXpt8divGaKTwEQAyv/6zObAfbUFRYK8 ohK47Kka98PoGxf2nAukox2vd6eI+8jAZlrLX68Yl52sb8EQ5yCb8sPPJafS3hSjDb2zYr 4z5ZdXJIf48gaD6QrijGtlsKgpzycjzkBNuAoC8q/v5jMBuPxVzMiCx/yqnjvTwjfkwrmV 6hYqeRR2d6XDkYHtw/YlU2s/oOdZAjwYXV9Sn9XJwJ7BdNhkYqw2BtwWrNyPIVcl43LXRk 3g7TrLLwhdC+OaRathbM+PfC3PrwY0t7x6iRCpZAg1r3Vx+qJ5joKK2/b6Expw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JRNnz3DcSsS/vAnCfMtyhZbmFg/4iKKA29VR1nqd48k=; b=U8qHYoO3jY89RPaHdVac2M+GjMd6NyJDI7JV9lyiS4oTO2tLkFx8HZej8vXA3FFyjpl0GH r+yRu15XhftYp3+z6mkJn+3eMSMwftFnXbyBigT7t1U0UL/NyenM4k/fUBgiL3JyoHBns4 hm+bcEGviGHWOf37ypUdIesdwxM+L8OPzu03pJQHZQL+Rpt0ZBNJ+dolVviQ4ff19AwuWU ap0fDAF8VH2Ldaw/5oH30Y/p25NJoQDg3H95wp044pOeRN5oP+Xb9y7IKj7LMCo2xCQjY4 rUT2G6UMt8ChvmXaCrAGO+aKyt+u1dxvdRlapTpAj4M0lnjHLxZe61+ZrQSu3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125470; a=rsa-sha256; cv=none; b=FdYamtsJZJYVHCPFRTpb7G9q9zdCUdJk6gVeMSfXqHVBIMk9SOcn1sjA4zgdfoOY8XEmM/ 5Gcx2+W/QPNCir35GS9YlHbKKjXlD3cpCrancDQxiD4cDDwyKz1nlXW8V1jRrf9hhGaIDg FQ0CbkGma/ee6KpccK0eqA4vVUR/TbGeglwyoiTUPt55XppJ9LRXoR9S6iQ5Okh+gy7x/S T7dr3di2imWhgwuVFc1/iFWs/ieWGAOM+k2Aa7rKyTZwaNkZ6HRCc+0uAEJjJ+4Vs0puAA j4Qcm7SaQ+ABopFnE9fXxkh3kCmUVdlWA763WfIYmuGQ3F0z9XSmf68gRoVyOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYB4glLzS8s; Wed, 24 Jan 2024 19:44: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 40OJiUFM004888; Wed, 24 Jan 2024 19:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiUdB004885; Wed, 24 Jan 2024 19:44:30 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:30 GMT Message-Id: <202401241944.40OJiUdB004885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 309b30ce8419 - stable/14 - lib/libc/amd64/string: implement strpbrk() through strcspn() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 309b30ce8419058b23b285d1c73549890fc174f5 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=309b30ce8419058b23b285d1c73549890fc174f5 commit 309b30ce8419058b23b285d1c73549890fc174f5 Author: Robert Clausecker AuthorDate: 2023-09-25 21:43:12 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:24 +0000 lib/libc/amd64/string: implement strpbrk() through strcspn() This lets us use our optimised strcspn() routine for strpbrk() calls. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41980 (cherry picked from commit f4fc317c364f2c81ad3d36763d8e5a60393ddbd1) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strcspn.S | 18 +++++++++------- lib/libc/amd64/string/strpbrk.c | 43 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 09bf7c8f251e..50c70007e99b 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -14,6 +14,7 @@ MDSRCS+= \ strcspn.S \ strlen.S \ strnlen.c \ + strpbrk.c \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/strcspn.S b/lib/libc/amd64/string/strcspn.S index 648635529e5b..7ebd7a847d67 100644 --- a/lib/libc/amd64/string/strcspn.S +++ b/lib/libc/amd64/string/strcspn.S @@ -33,13 +33,15 @@ #define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ -ARCHFUNCS(strcspn) - ARCHFUNC(strcspn, scalar) + .weak strcspn + .set strcspn, __strcspn +ARCHFUNCS(__strcspn) + ARCHFUNC(__strcspn, scalar) NOARCHFUNC - ARCHFUNC(strcspn, x86_64_v2) -ENDARCHFUNCS(strcspn) + ARCHFUNC(__strcspn, x86_64_v2) +ENDARCHFUNCS(__strcspn) -ARCHENTRY(strcspn, scalar) +ARCHENTRY(__strcspn, scalar) push %rbp # align stack to enable function call mov %rsp, %rbp sub $256, %rsp # allocate space for lookup table @@ -122,7 +124,7 @@ ARCHENTRY(strcspn, scalar) sub (%rsp), %rax # length of prefix before match leave ret -ARCHEND(strcspn, scalar) +ARCHEND(__strcspn, scalar) /* * This kernel uses pcmpistri to do the heavy lifting. @@ -134,7 +136,7 @@ ARCHEND(strcspn, scalar) * 17--32: two pcmpistri per 16 bytes of input * >=33: fall back to look up table */ -ARCHENTRY(strcspn, x86_64_v2) +ARCHENTRY(__strcspn, x86_64_v2) push %rbp mov %rsp, %rbp sub $256, %rsp @@ -389,6 +391,6 @@ ARCHENTRY(strcspn, x86_64_v2) 2: sub %rdi, %rax # number of characters preceding match leave ret -ARCHEND(strcspn, x86_64_v2) +ARCHEND(__strcspn, x86_64_v2) .section .note.GNU-stack,"",%progbits diff --git a/lib/libc/amd64/string/strpbrk.c b/lib/libc/amd64/string/strpbrk.c new file mode 100644 index 000000000000..87f587789991 --- /dev/null +++ b/lib/libc/amd64/string/strpbrk.c @@ -0,0 +1,43 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 + */ + +#include + +#include + +size_t __strcspn(const char *, const char *); + +char * +strpbrk(const char *s, const char *charset) +{ + size_t loc; + + loc = __strcspn(s, charset); + + return (s[loc] == '\0' ? NULL : (char *)&s[loc]); +} From nobody Wed Jan 24 19:44:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYD2RMlz58bqc; Wed, 24 Jan 2024 19:44: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 4TKvYC6THgz45K8; Wed, 24 Jan 2024 19:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7t+kWDBwyG+dl3r4sM6NNzT19EmcGQWzZ/QRkY7xN3c=; b=qZLtbSyADQjMRWyYp2zVfmXiPyz5wn7SkdMS/3GAKd36f8UCtTzHJJ38TWWkPKSvaaCXX9 CPjNTpSk6Vt3gOhtdPJcX9NWb+y/Sv/nE3WmO2YT8XofWALsLr1hHoXf2izxMfztuHjepF neNniUbVLJBVXJelUNlT7ThJMkVCZ412+CKln4db4muRaO/opKp5rfN0FBe7V/jAoxg2q8 YSshjKF/9FaE+85B6oCqYwdWLjz6eCydVXdHgw3Gs4gHkE/jhzFHjBQIlqkqGpYKQEBoya swnqbBv0yl31VqCrez3YWbUdnEk6nRe63lOFJtaE4Hxrb8BIVMedXCZls/IzlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7t+kWDBwyG+dl3r4sM6NNzT19EmcGQWzZ/QRkY7xN3c=; b=B84iMquKhl4AfZTbJEt7A1z5oCELzzPVGKcVFazLo+5ITYoeA/KB5tTtExeVt1Srz5QgCd Jc82alehlt8DVCezkvAjXwGu7gs7Cg7UHjsZurqs8zVwFkPbJXoKW8F5Flwl0u5q+8fWkR WrYBnvzVdhCJpSANEVGPAQOdCm5EXvYuWd0xHbR1ZzobDnUOe7Y4ahIUKbQSz/0LlB6gHh TkoVgoUIKgaaNoQt44hA8BKYg1eHveHPwp/gdmUgS0cB2x+kJQzNwK++15aZgyKcPCUftd PDdLKejhNU0FlJj3DcMhVJnQipDyPeIjcfJJUgJCpGyzA5fwyRZxZxs32vWjlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125471; a=rsa-sha256; cv=none; b=YDsNVW8rpcGs7AtutAlJS0DjRzHVnPxxRqcA80xMDC/pZaSnBxbWIxXfrgeFro0LixfNjb dSltY8skyO5BuS/zwzTgC4R20H6sioo+RAe3y2Jq2LtuI5nymvcjkbzvuR9gAf2BD2McKo m+e2JSJfroN6bEMJipMG9Yvq6KkhzA25vfjfT0XdR9WzWkBTvmM4R2DA/UzejfsJajK44M xZDn3P3IAc2Jhiw5C2EXhfo1Onr0EQd2Uo1Lc08bkMGpuN9tRDhWezEyoLokTVVu3YNygD CwzAUhrctSac1hGoTc2UUKcpGAvZ78q9LOmzLrpBAF2AIbbgle8GRTgWimI3BA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYC5GgGzRkK; Wed, 24 Jan 2024 19:44: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 40OJiVnf004937; Wed, 24 Jan 2024 19:44:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiVRZ004934; Wed, 24 Jan 2024 19:44:31 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:31 GMT Message-Id: <202401241944.40OJiVRZ004934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: f42eca44bdfb - stable/14 - share/man/man7/simd.7: document amd64 SIMD use for strpbrk() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f42eca44bdfba36f4a3dc004593117e079af4d92 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f42eca44bdfba36f4a3dc004593117e079af4d92 commit f42eca44bdfba36f4a3dc004593117e079af4d92 Author: Robert Clausecker AuthorDate: 2023-09-25 21:45:26 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:25 +0000 share/man/man7/simd.7: document amd64 SIMD use for strpbrk() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D41980 (cherry picked from commit 8b60e1fdbefab1ffbc1b4222ae0a67e1d455fb45) --- share/man/man7/simd.7 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index fc91ded85698..cab48a01ead1 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -76,6 +76,7 @@ Enhanced functions are present in the following architectures: .It strncpy Ta Ta Ta Ta Ta S2 .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta Ta S +.It strpbrk Ta Ta Ta S2 .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S .It timingsafe_bcmp Ta Ta Ta S1 From nobody Wed Jan 24 19:44:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYF3Q85z58bqg; Wed, 24 Jan 2024 19:44: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 4TKvYF0cLkz4550; Wed, 24 Jan 2024 19:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bN9hTyQ2FhluaaP6h6LIy6i/jYD1kNMvinZgdU3FDZk=; b=wDjpboQKEGb/SfOUkmxIMhdOcikGW70MuSug4/lgvN+v5JRy1o61Mwu5hLT7/T5hq3esko 3k54X2nDmvXijpglGXBj30ljtHcwUtwyUSef4hpBkPlQJHFC8gSb/E1v3lXzV+AdmuhwKS EQhq8WqpibOSx7D692nKikEVBOTHhpdWdJpzrWiV3ahiv/t6mE9IIUv6TOdT38/eImbe5/ JyUZaxnzTm2ZhaWsBfiI8JC36VRrwjX1aKaob2W/upWjq3mizLQ8OFYAe4Z9ncbNopFG0Y zx0c8pOQyHasTD6AO1hRYinMsCKYOy+Y/Pa9xOqKr4KBn2nCm5BKqTjb52wq7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bN9hTyQ2FhluaaP6h6LIy6i/jYD1kNMvinZgdU3FDZk=; b=O4+i9j80C5mVJGpqBmYZSPFb8Rpi6GfYcHHNG61dTW3A94w/5AfHxpXUOA9SYPQvFOHGID Ibu+9XTdhEi1EgDCYIDnyEFsO49m8n56eE+dxPZAPTDUsY6kSELDWb++2JcLyya0NFT5pA ObTn+g9E00DN5UGDd6JK2roPv5UtvaJ/n4JrLBOCasID4WyYxgtOSdJAVI8LEWdKIwrqUV 6VukBay1C7T5YOsgdivowyRk9UjzYKNc/1siZDd2Pm5WIVuJuenQf75neEfUHS2p6lxnZb lJij+V+H0sUHrhbupW+ob3xuAeXbeTpUr4zBvJ7mgvHk8tIDqcZRCVes6wQTyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125473; a=rsa-sha256; cv=none; b=x3nEKAEGw98QMV6GYv48Mgnl5+dZ97jh6RdGpi0Cbo3uSLImsZETe+uqdCGTjmg/3GzL62 40185+PmPfJ55ZG8mOgdoUTQVLXols6QY8ixOd+y21cMAuadSptm7N4Stz7A1KV3XVHnFX lEYR21EYjkmPIByC/wbmlF3pZvl3ZCfaRpcCv+mxqEZPI1vVtvitYGd0SFGaU2ov2avT8b GGQMYUNqfxIAkgsmiZF+qBIdjGxrqbiGdvFbjkc9RV+n8ol4KI/IE/Tx1lUiEyA7ImmgjW JQcyka3i/25j0DmXSrJ0UHCIMkEXkcFZA6tdl7hhLuOYmRe8eWGb/vYAtrIiDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYD6JqZzRy6; Wed, 24 Jan 2024 19:44: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 40OJiW9w004982; Wed, 24 Jan 2024 19:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiWk0004979; Wed, 24 Jan 2024 19:44:32 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:32 GMT Message-Id: <202401241944.40OJiWk0004979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 098997c5f05e - stable/14 - lib/libc/tests/string: add unit tests for strncmp(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 098997c5f05e157f2fae2787ec9a8b372156d487 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=098997c5f05e157f2fae2787ec9a8b372156d487 commit 098997c5f05e157f2fae2787ec9a8b372156d487 Author: Robert Clausecker AuthorDate: 2023-09-28 20:40:20 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:25 +0000 lib/libc/tests/string: add unit tests for strncmp(3) These are patterned after the previously added (D41970) strcmp tests, but are extended to check for various length conditions. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42122 (cherry picked from commit 459ddefcc9dcc010f6f7445285e61e2b6780379c) --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/strncmp_test.c | 165 +++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index a090e1bd3463..5874f7b6b873 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C+= flsl_test ATF_TESTS_C+= flsll_test ATF_TESTS_C+= memcmp_test ATF_TESTS_C+= memset_s_test +ATF_TESTS_C+= strncmp_test ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strcmp2_test ATF_TESTS_C+= strcspn_test diff --git a/lib/libc/tests/string/strncmp_test.c b/lib/libc/tests/string/strncmp_test.c new file mode 100644 index 000000000000..989c58bcfedf --- /dev/null +++ b/lib/libc/tests/string/strncmp_test.c @@ -0,0 +1,165 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 + */ + +#include + +#include +#include +#include + +int (*volatile strncmp_fn)(const char *, const char *, size_t); + +static void +alignment_testcase(char *a, char *b, int want, size_t len) +{ + int res; + + res = strncmp_fn(a, b, len); + ATF_CHECK_MSG(want == (res > 0) - (res < 0), + "strcmp(%p \"%s\", %p \"%s\", %zu) = %d != %d", + (void *)a, a, (void *)b, b, len, res, want); +} + +static void +check_strncmp_alignments(char a[], char b[], + size_t a_off, size_t b_off, size_t len, size_t pos) +{ + char *a_str, *b_str, a_orig, b_orig; + + a[a_off] = '\0'; + b[b_off] = '\0'; + + a_str = a + a_off + 1; + b_str = b + b_off + 1; + + a_str[len] = '\0'; + b_str[len] = '\0'; + a_str[len+1] = 'A'; + b_str[len+1] = 'B'; + + a_orig = a_str[pos]; + b_orig = b_str[pos]; + + alignment_testcase(a_str, b_str, 0, len + 16); + alignment_testcase(a_str, b_str, 0, len + 1); + alignment_testcase(a_str, b_str, 0, len); + + if (pos < len) { + a_str[pos] = '\0'; + alignment_testcase(a_str, b_str, -1, len + 16); + alignment_testcase(a_str, b_str, -1, len + 1); + alignment_testcase(a_str, b_str, -1, len); + alignment_testcase(a_str, b_str, -1, pos + 1); + alignment_testcase(a_str, b_str, 0, pos); + a_str[pos] = a_orig; + + b_str[pos] = '\0'; + alignment_testcase(a_str, b_str, 1, len + 16); + alignment_testcase(a_str, b_str, 1, len + 1); + alignment_testcase(a_str, b_str, 1, len); + alignment_testcase(a_str, b_str, 1, pos + 1); + alignment_testcase(a_str, b_str, 0, pos); + b_str[pos] = b_orig; + } + + a_str[pos] = 'X'; + alignment_testcase(a_str, b_str, 1, len + 16); + alignment_testcase(a_str, b_str, 0, pos); + alignment_testcase(a_str, b_str, 1, pos + 1); + if (pos < len) { + alignment_testcase(a_str, b_str, 1, len); + alignment_testcase(a_str, b_str, 1, len + 1); + } + a_str[pos] = a_orig; + + b_str[pos] = 'X'; + alignment_testcase(a_str, b_str, -1, len + 16); + alignment_testcase(a_str, b_str, 0, pos); + alignment_testcase(a_str, b_str, -1, pos + 1); + if (pos < len) { + alignment_testcase(a_str, b_str, -1, len); + alignment_testcase(a_str, b_str, -1, len + 1); + } + b_str[pos] = b_orig; + + a[a_off] = '-'; + b[b_off] = '-'; + a_str[len] = '-'; + b_str[len] = '-'; + a_str[len+1] = '-'; + b_str[len+1] = '-'; +} + +ATF_TC(strncmp_alignments); +ATF_TC_HEAD(strncmp_alignments, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test strncmp(3) with various alignments"); +} + +ATF_TC_BODY(strncmp_alignments, tc) +{ + size_t a_off, b_off, len, pos; + char a[64+16+16+3], b[64+16+16+3]; + + memset(a, '-', sizeof(a)); + memset(b, '-', sizeof(b)); + a[sizeof(a) - 1] = '\0'; + b[sizeof(b) - 1] = '\0'; + + for (a_off = 0; a_off < 16; a_off++) + for (b_off = 0; b_off < 16; b_off++) + for (len = 1; len <= 64; len++) + for (pos = 0; pos <= len; pos++) + check_strncmp_alignments(a, b, a_off, b_off, len, pos); +} + +ATF_TC(strncmp_null); +ATF_TC_HEAD(strncmp_null, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test strncmp(3) with null pointers"); +} + +ATF_TC_BODY(strncmp_null, tc) +{ + alignment_testcase(NULL, NULL, 0, 0); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + strncmp_fn = dlsym(dl_handle, "test_strncmp"); + if (strncmp_fn == NULL) + strncmp_fn = strncmp; + + ATF_TP_ADD_TC(tp, strncmp_alignments); + ATF_TP_ADD_TC(tp, strncmp_null); + + return atf_no_error(); +} From nobody Wed Jan 24 19:44:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYG3kDkz58bsv; Wed, 24 Jan 2024 19:44: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 4TKvYG10d9z45Pj; Wed, 24 Jan 2024 19:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6k6hI8oxvtMpbohVQWQmoOWiExD9V7YVKl+oEpmML0=; b=AP/UwY7F5uKfb80SocqnsQXd2ooE7mG2wOiQmqmiNcRr6vfsyW0hWHOHkRw9GrjBoyOlAc rEUo4+C6QkcbWeOIneEK1IazZhlrMpfFKPgYEbdKowNxln7cTSMJW9Dtft6CimLCVrG+jT EOhaq3+t3aysRhE+AMP/7kO+xkRRXI5I6SxtC20mEqPZGbLeSu0Gv5rAoenAxdClhUIl1N Ng0aTnXf9PWIIPF6B5xLfAS/Y0SDfgiCgZFhX0uOK8HvA8KsjJTLkARdRLUqH1yN+KHvKX r3cA1Miw/MPDp+n8LkfDOjg9JhNNPp4I+zRoTM4+Y4SiBEvktRgle6Q9B24A2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6k6hI8oxvtMpbohVQWQmoOWiExD9V7YVKl+oEpmML0=; b=tCwcwoWSzWKWq57mVY6dllOdJcSXrcVrWOpC3eRcCgjVdzEa4jcZFNOTD/cvkjaOawRZDL VXPPY7cQzbABLAcEA/JI5rC6lcqbVmT5BNQIEX9gKtLru5e8poTbmhx7t2VM8tqZDPjP3b R7brzzK+loa7DrB0rADXdVYEjlBIVDwNobfdm0nsmTMiB6AwjO6nSzezXTsnAcWfm6lzvT y6FKBzs4HeIP1p5wzJyNlDr38CIf2hedWokg6Bx07F9hQBLx9RCkwbzW/0kF8nHu21WRSX jCCYUHT7XSBZY2fHNuBfovlfY9O1DJcTEXLPEWxFqelR+zuoLcl7xyd4VGcR0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125474; a=rsa-sha256; cv=none; b=JbMjP5Wl9+mTLThrn0/10G7Iixcrq0p6uc2dQX8pewgu5hJu3oTO9OJ6LU5UCEtd5Tn/Xa yCQcXnmlkEM0I/viENSABCkZUmvzR1vc0a2xaCdMDLIEuozXMqkq4NGJzx/xGlcibGgoEy /tFRv65DBkE/EkoJrds7J2UAIzpae4GafhODS8iphb2UwGD5rps5jXmRCIq/BgeUrYoR/5 j4UHElpbm7aderMea9Zg2rQNbvqmixL7S1CreS5hxVuByXXdFU4Act6bWHkitQ+AAx4AO/ Hhvb1OqMO0YROU62ToMaiMYazeEkCgq1ewUo5rwJ2AndXrDHKpiCNOabxSLx8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYF72wkzRms; Wed, 24 Jan 2024 19:44: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 40OJiXUv005027; Wed, 24 Jan 2024 19:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiXxp005024; Wed, 24 Jan 2024 19:44:33 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:33 GMT Message-Id: <202401241944.40OJiXxp005024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 3a19fcb9fdbf - stable/14 - lib/libc/amd64/string: add strncmp scalar, baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a19fcb9fdbfd8bbc5955b14aba9bf481de2ad1a Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3a19fcb9fdbfd8bbc5955b14aba9bf481de2ad1a commit 3a19fcb9fdbfd8bbc5955b14aba9bf481de2ad1a Author: Robert Clausecker AuthorDate: 2023-09-27 22:46:04 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:25 +0000 lib/libc/amd64/string: add strncmp scalar, baseline implementation The scalar implementation is fairly straightforward and merely unrolled four times. The baseline implementation closely follows D41971 with appropriate extensions and extra code paths to pay attention to string length. Performance is quite good. We beat both glibc (except for very long strings, but they likely use AVX which we don't) and Bionic (except for medium-sized aligned strings, where we are still in the same ballpark). Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42122 (cherry picked from commit 14289e973f5c941e4502cc2b11265e4b3072839a) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncmp.S | 488 +++++++++++++++++++++++++++++++++++++ 2 files changed, 489 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 50c70007e99b..51645ba3b8af 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcpy.c \ strcspn.S \ strlen.S \ + strncmp.S \ strnlen.c \ strpbrk.c \ strspn.S \ diff --git a/lib/libc/amd64/string/strncmp.S b/lib/libc/amd64/string/strncmp.S new file mode 100644 index 000000000000..932cf078bdfc --- /dev/null +++ b/lib/libc/amd64/string/strncmp.S @@ -0,0 +1,488 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 + */ + +#include +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + +ARCHFUNCS(strncmp) + ARCHFUNC(strncmp, scalar) + ARCHFUNC(strncmp, baseline) +ENDARCHFUNCS(strncmp) + +/* + * This is just the scalar loop unrolled a bunch of times. + */ +ARCHENTRY(strncmp, scalar) + xor %eax, %eax + sub $4, %rdx # 4 chars left to compare? + jbe 1f + + ALIGN_TEXT +0: movzbl (%rdi), %ecx + test %ecx, %ecx # NUL char in first string? + jz .L0 + cmpb (%rsi), %cl # mismatch between strings? + jnz .L0 + + movzbl 1(%rdi), %ecx + test %ecx, %ecx + jz .L1 + cmpb 1(%rsi), %cl + jnz .L1 + + movzbl 2(%rdi), %ecx + test %ecx, %ecx + jz .L2 + cmpb 2(%rsi), %cl + jnz .L2 + + movzbl 3(%rdi), %ecx + test %ecx, %ecx + jz .L3 + cmpb 3(%rsi), %cl + jnz .L3 + + add $4, %rdi # advance to next iteration + add $4, %rsi + sub $4, %rdx + ja 0b + + /* end of string within the next 4 characters */ +1: cmp $-4, %edx # end of string reached immediately? + jz .Leq + movzbl (%rdi), %ecx + test %ecx, %ecx + jz .L0 + cmpb (%rsi), %cl + jnz .L0 + + cmp $-3, %edx # end of string reached after 1 char? + jz .Leq + movzbl 1(%rdi), %ecx + test %ecx, %ecx + jz .L1 + cmpb 1(%rsi), %cl + jnz .L1 + + cmp $-2, %edx + jz .Leq + movzbl 2(%rdi), %ecx + test %ecx, %ecx + jz .L2 + cmpb 2(%rsi), %cl + jnz .L2 + + cmp $-1, %edx # either end of string after 3 chars, + jz .Leq # or it boils down to the last char + +.L3: inc %eax +.L2: inc %eax +.L1: inc %eax +.L0: movzbl (%rsi, %rax, 1), %ecx + movzbl (%rdi, %rax, 1), %eax + sub %ecx, %eax +.Leq: ret +ARCHEND(strncmp, scalar) + +ARCHENTRY(strncmp, baseline) + push %rbx + sub $1, %rdx # RDX--, so RDX points to the last byte to compare + jb .Lempty # where there any bytes to compare at all? + + lea 15(%rdi), %r8d # end of head + lea 15(%rsi), %r9d + mov %edi, %eax + mov %esi, %ebx + xor %edi, %r8d # bits that changed between first and last byte + xor %esi, %r9d + and $~0xf, %rdi # align heads to 16 bytes + and $~0xf, %rsi + or %r8d, %r9d + and $0xf, %eax # offset from alignment + and $0xf, %ebx + movdqa (%rdi), %xmm0 # load aligned heads + movdqa (%rsi), %xmm2 + pxor %xmm1, %xmm1 + cmp $16, %rdx # end of buffer within the first 32 bytes? + jb .Llt16 + + test $PAGE_SIZE, %r9d # did the page change? + jz 0f # if not, take fast path + + + /* heads may cross page boundary, avoid unmapped loads */ + movdqa %xmm0, -32(%rsp) # stash copies of the heads on the stack + movdqa %xmm2, -16(%rsp) + mov $-1, %r8d + mov $-1, %r9d + mov %eax, %ecx + shl %cl, %r8d # string head in XMM0 + mov %ebx, %ecx + shl %cl, %r9d # string head in XMM2 + pcmpeqb %xmm1, %xmm0 + pcmpeqb %xmm1, %xmm2 + pmovmskb %xmm0, %r10d + pmovmskb %xmm2, %r11d + test %r8d, %r10d # NUL byte present in first string? + lea -32(%rsp), %r8 + cmovz %rdi, %r8 + test %r9d, %r11d # NUL byte present in second string? + lea -16(%rsp), %r9 + cmovz %rsi, %r9 + movdqu (%r8, %rax, 1), %xmm0 # load true (or fake) heads + movdqu (%r9, %rbx, 1), %xmm4 + jmp 1f + + /* rdx == 0 */ +.Lempty: + xor %eax, %eax # zero-length buffers compare equal + pop %rbx + ret + +0: movdqu (%rdi, %rax, 1), %xmm0 # load true heads + movdqu (%rsi, %rbx, 1), %xmm4 +1: pxor %xmm2, %xmm2 + pcmpeqb %xmm0, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm4 # which bytes match? + pandn %xmm4, %xmm2 # match and not NUL byte? + pmovmskb %xmm2, %r9d + xor $0xffff, %r9d # mismatch or NUL byte? + jnz .Lhead_mismatch + + /* load head and second chunk */ + movdqa 16(%rdi), %xmm2 # load second chunks + movdqa 16(%rsi), %xmm3 + lea -16(%rdx, %rbx, 1), %rdx # account for length of RSI chunk + sub %rbx, %rax # is a&0xf >= b&0xf? + jb .Lswapped # if not, proceed with swapped operands + jmp .Lnormal + + /* buffer ends within the first 16 bytes */ +.Llt16: test $PAGE_SIZE, %r9d # did the page change? + jz 0f # if not, take fast path + + /* heads may cross page boundary */ + movdqa %xmm0, -32(%rsp) # stash copies of the heads on the stack + movdqa %xmm2, -16(%rsp) + mov $-1, %r8d + mov $-1, %r9d + mov %eax, %ecx + shl %cl, %r8d # string head in XMM0 + mov %ebx, %ecx + shl %cl, %r9d # string head in XMM2 + pcmpeqb %xmm1, %xmm0 + pcmpeqb %xmm1, %xmm2 + pmovmskb %xmm0, %r10d + pmovmskb %xmm2, %r11d + lea (%rdx, %rax, 1), %ecx # location of last buffer byte in xmm0 + bts %ecx, %r10d # treat as if NUL byte present + lea (%rdx, %rbx, 1), %ecx + bts %ecx, %r11d + test %r8w, %r10w # NUL byte present in first string head? + lea -32(%rsp), %r8 + cmovz %rdi, %r8 + test %r9w, %r11w # NUL byte present in second string head? + lea -16(%rsp), %r9 + cmovz %rsi, %r9 + movdqu (%r8, %rax, 1), %xmm0 # load true (or fake) heads + movdqu (%r9, %rbx, 1), %xmm4 + jmp 1f + +0: movdqu (%rdi, %rax, 1), %xmm0 # load true heads + movdqu (%rsi, %rbx, 1), %xmm4 +1: pxor %xmm2, %xmm2 + pcmpeqb %xmm0, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm4 # which bytes match? + pandn %xmm4, %xmm2 # match and not NUL byte? + pmovmskb %xmm2, %r9d + btr %edx, %r9d # induce mismatch in last byte of buffer + not %r9d # mismatch or NUL byte? + + /* mismatch in true heads */ + ALIGN_TEXT +.Lhead_mismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rax, %rdi # return to true heads + add %rbx, %rsi + movzbl (%rdi, %r9, 1), %eax # mismatching characters + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax + pop %rbx + ret + + /* rax >= 0 */ + ALIGN_TEXT +.Lnormal: + neg %rax + movdqu 16(%rsi, %rax, 1), %xmm0 + sub %rdi, %rsi # express RSI as distance from RDI + lea (%rsi, %rax, 1), %rbx # point RBX to offset in second string + neg %rax # ... corresponding to RDI + pcmpeqb %xmm3, %xmm1 # NUL present? + pcmpeqb %xmm2, %xmm0 # Mismatch between chunks? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + mov $16, %ecx + cmp %rcx, %rdx # does the buffer end within (RDI,RSI,1)? + cmovb %edx, %ecx # ECX = min(16, RDX) + add $32, %rdi # advance to next iteration + bts %ecx, %r8d # mark end-of-buffer as if there was a NUL byte + test %r8w, %r8w # NUL or end of buffer found? + jnz .Lnul_found2 + xor $0xffff, %r9d + jnz .Lmismatch2 + sub $48, %rdx # end of buffer within first main loop iteration? + jb .Ltail # if yes, process tail + + /* + * During the main loop, the layout of the two strings is something like: + * + * v ------1------ v ------2------ v + * RDI: AAAAAAAAAAAAABBBBBBBBBBBBBBBB... + * RSI: AAAAAAAAAAAAABBBBBBBBBBBBBBBBCCC... + * + * where v indicates the alignment boundaries and corresponding chunks + * of the strings have the same letters. Chunk A has been checked in + * the previous iteration. This iteration, we first check that string + * RSI doesn't end within region 2, then we compare chunk B between the + * two strings. As RSI is known not to hold a NUL byte in regsions 1 + * and 2 at this point, this also ensures that RDI has not ended yet. + */ + ALIGN_TEXT +0: movdqu (%rdi, %rbx, 1), %xmm0 # chunk of 2nd string corresponding to RDI + pxor %xmm1, %xmm1 + pcmpeqb (%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_found + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatch + + /* main loop unrolled twice */ + movdqu 16(%rdi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rdi, %rsi, 1), %xmm1 + pcmpeqb 16(%rdi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rdi + test %r8d, %r8d + jnz .Lnul_found2 + xor $0xffff, %r9d + jnz .Lmismatch2 + sub $32, %rdx # end of buffer within next iteration? + jae 0b + + /* end of buffer will occur in next 32 bytes */ +.Ltail: movdqu (%rdi, %rbx, 1), %xmm0 # chunk of 2nd string corresponding to RDI + pxor %xmm1, %xmm1 + pcmpeqb (%rdi, %rsi, 1), %xmm1 # end of string in RSI? + pcmpeqb (%rdi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + bts %edx, %r8d # indicate NUL byte at last byte in buffer + test %r8w, %r8w # NUL byte in first chunk? + jnz .Lnul_found + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatch + + /* main loop unrolled twice */ + movdqu 16(%rdi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rdi, %rsi, 1), %xmm1 + pcmpeqb 16(%rdi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + sub $16, %edx # take first half into account + bts %edx, %r8d # indicate NUL byte at last byte in buffer + add $32, %rdi + +.Lnul_found2: + sub $16, %rdi + +.Lnul_found: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8d # adjust NUL mask to positions in RDI/RBX + not %r9d # mask of mismatches + or %r8w, %r9w # NUL bytes als count as mismatches + jnz .Lmismatch + + /* + * (RDI) == (RSI) and NUL is past the string. + * compare (RSI) with the corresponding part + * of the other string until the NUL byte. + */ + movdqu (%rdi, %rax, 1), %xmm0 + pcmpeqb (%rdi, %rsi, 1), %xmm0 + add %rdi, %rsi # restore RSI pointer + add %rax, %rdi # point RDI to chunk corresponding to (RSI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + pop %rbx + ret + +.Lmismatch2: + sub $16, %rdi + + /* a mismatch has been found between RBX and RSI */ +.Lmismatch: + tzcnt %r9d, %r9d # where is the mismatch? + add %rdi, %rbx # turn RBX from offset into pointer + movzbl (%rbx, %r9, 1), %ecx + movzbl (%rdi, %r9, 1), %eax + sub %ecx, %eax + pop %rbx + ret + + /* rax < 0 */ + ALIGN_TEXT +.Lswapped: + movdqu 16(%rdi, %rax, 1), %xmm0 + sub %rsi, %rdi # express RDI as distance from RDI + lea (%rdi, %rax, 1), %rbx # point RBX to offset in first string + pcmpeqb %xmm2, %xmm1 # NUL present? + pcmpeqb %xmm3, %xmm0 # mismatch between chunks? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add %rax, %rdx # RDX points to buffer end in RSI + neg %rax # ... corresponding to RSI + mov $16, %ecx + cmp %rcx, %rdx # does the buffer end within (RSI,RDI,1)? + cmovb %edx, %ecx # ECX = min(16, RDX) + add $32, %rsi + bts %ecx, %r8d # mark end-of-buffer as if there was a NUL byte + test %r8w, %r8w # NUL or end of buffer found? + jnz .Lnul_found2s + xor $0xffff, %r9d + jnz .Lmismatch2s + sub $48, %rdx # end of buffer within first main loop iteration? + jb .Ltails # if yes, process tail + + ALIGN_TEXT +0: movdqu (%rsi, %rbx, 1), %xmm0 # chunk of 1st string corresponding to RSI + pxor %xmm1, %xmm1 + pcmpeqb (%rsi, %rdi, 1), %xmm1 # end of string in RDI? + pcmpeqb (%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + test %r8d, %r8d + jnz .Lnul_founds + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatchs + + /* main loop unrolled twice */ + movdqu 16(%rsi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi, %rdi, 1), %xmm1 + pcmpeqb 16(%rsi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + add $32, %rsi + test %r8d, %r8d + jnz .Lnul_found2s + xor $0xffff, %r9d + jnz .Lmismatch2s + sub $32, %rdx # end of buffer within next iteration? + jae 0b + + /* end of buffer will occur in next 32 bytes */ +.Ltails: + movdqu (%rsi, %rbx, 1), %xmm0 # chunk of 1st string corresponding to RSI + pxor %xmm1, %xmm1 + pcmpeqb (%rsi, %rdi, 1), %xmm1 # end of string in RDI? + pcmpeqb (%rsi), %xmm0 # where do the chunks match? + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + bts %edx, %r8d # indicate NUL byte at laste byte in buffer + test %r8w, %r8w # NUL byte in first chunk? + jnz .Lnul_founds + xor $0xffff, %r9d # any mismatches? + jnz .Lmismatchs + + /* main loop unrolled twice */ + movdqu 16(%rsi, %rbx, 1), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi, %rdi, 1), %xmm1 + pcmpeqb 16(%rsi), %xmm0 + pmovmskb %xmm1, %r8d + pmovmskb %xmm0, %r9d + sub $16, %edx # take first half into account + bts %edx, %r8d # indicate NUL byte at laste byte in buffer + add $32, %rsi + +.Lnul_found2s: + sub $16, %rsi + +.Lnul_founds: + mov %eax, %ecx + mov %r8d, %r10d + shl %cl, %r8d # adjust NUL mask to positions in RSI/RBX + not %r9d # mask of mismatches + or %r8w, %r9w # NUL bytes also count as mismatches + jnz .Lmismatchs + + movdqu (%rsi, %rax, 1), %xmm0 + pcmpeqb (%rsi, %rdi, 1), %xmm0 + add %rsi, %rdi # restore RDI pointer + add %rax, %rsi # point RSI to chunk corresponding to (RDI) + pmovmskb %xmm0, %ecx # mask of matches + not %ecx # mask of mismatches + or %r10d, %ecx # mask of mismatches or NUL bytes + tzcnt %ecx, %ecx # location of first mismatch + movzbl (%rdi, %rcx, 1), %eax + movzbl (%rsi, %rcx, 1), %ecx + sub %ecx, %eax + pop %rbx + ret + +.Lmismatch2s: + sub $16, %rsi + +.Lmismatchs: + tzcnt %r9d, %r9d # where is the mismatch? + add %rsi, %rbx # turn RBX from offset into pointer + movzbl (%rbx, %r9, 1), %eax + movzbl (%rsi, %r9, 1), %ecx + sub %ecx, %eax + pop %rbx + ret +ARCHEND(strncmp, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYH50gxz58bYN; Wed, 24 Jan 2024 19:44: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 4TKvYH21lKz45ZQ; Wed, 24 Jan 2024 19:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKdCSygBEq8qsP2bXC2pu5KcLDi1oyWwet7AEgwweBs=; b=IYNc27tGdFBYe6VNMUfda6N2ccqScl6GLbEPE9OyI5wUv0y0U/QGGAROPZBHSMgIEEsfd8 OvZnBvmvymHDMkEgPqbYmK9CLTASlV4AXR3lRvJoyajmq1Dy4DFfiX7Usi7gdxr1jyc9K9 8qcHfHPLp2WXuhTZXByuVVIpmCW5irfTQYZJlzrYKLBc3wgKVj2T8G/M7Tx06gDV21bG9e cbQ0YbzXLt8XarZRWfVE2MzP2zjh/B7K14qjsrTu84eADSJuq97jFt0HK/jqYyMG3L0GYL 0/M4UJADsHR0WE1Lh2gTb2k+TnuV28IkOWqVGIjapl7UYGslpQDs2BghsXMtfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GKdCSygBEq8qsP2bXC2pu5KcLDi1oyWwet7AEgwweBs=; b=soKJ+vyBR9Zn53zBwQkzzIHaAlNINKkAQFVQ9cuV9B+BhdPsZb0X17Oqrt+SzS4hq1Gy5d ji6M76Yc8UfI8vttlwuuNrzPKEXCcHSXqjZkgnxv0yyHuENbVvm988IyJVBORxFoDio4Vj ViazqTmm/IbPpMdBghHpHlyTapUl2YYjxkIRsE+Vtxu6Z2UPhmYZ0RYK4T2RgXWA0Jm5Z7 VQL7tD8MTSszXyytQQPr6UCpjPk3ZquMCUjR2Z8KuU/t/9wZHVocALxV3YVM0z8MNJ+TbG YDWlWTDkU8Hvy4FLMzkTKdCK2Vlkc715/XmxoYvzsDIm1PwTldKWqpI8PrUArg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125475; a=rsa-sha256; cv=none; b=PyqOF8sENqIjd4Dib3uI9rlq+bL1tjR9wopvvV+9wS4nMIqqhoq3jsTdqzgQeuXTQ6Bw0U 9i/JA5D79wUhTP/Rv+MsIjdSrz98kE/T4qE5W4asYZeYiRXDUBEm+LCmnYoRKb6narfv9Q 0uYJfBT0KAedHbZx00jT6yCALvVgxX340gVAyBHXgYYFeRNGuMpLP8R7uyqV7c+mjDISEd xzWhIrmYaPw3P59PN5NP/CD1SF7BhCipeAYvzXK4gYZ5VZW99U1KLhHf7VoWltrejJqgLX csAhcOpaZQslDRBgMv4bqri2B86Dn20diWA/rTXYAnuDEZu/Lyk+FzZfoq8WvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYH0lzlzSFM; Wed, 24 Jan 2024 19:44: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 40OJiZYm005075; Wed, 24 Jan 2024 19:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiZho005072; Wed, 24 Jan 2024 19:44:35 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:35 GMT Message-Id: <202401241944.40OJiZho005072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: fa6d214aa16e - stable/14 - share/man/man7/simd.7: document strncmp amd64 scalar, baseline implementations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa6d214aa16ed3f86b4f597fbdca9d606579e3b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=fa6d214aa16ed3f86b4f597fbdca9d606579e3b2 commit fa6d214aa16ed3f86b4f597fbdca9d606579e3b2 Author: Robert Clausecker AuthorDate: 2023-10-08 02:46:36 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:25 +0000 share/man/man7/simd.7: document strncmp amd64 scalar, baseline implementations Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42122 (cherry picked from commit f5edd8450e5328c5b88977b4d00e780cdd744dea) --- share/man/man7/simd.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index cab48a01ead1..39642429c1c4 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd September 25, 2023 +.Dd October 7, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -72,7 +72,7 @@ Enhanced functions are present in the following architectures: .It strcpy Ta Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 .It strlen Ta Ta S Ta S1 -.It strncmp Ta Ta S Ta Ta S +.It strncmp Ta Ta S Ta S1 Ta S .It strncpy Ta Ta Ta Ta Ta S2 .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta Ta S From nobody Wed Jan 24 19:44:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYJ4z1Pz58bt1; Wed, 24 Jan 2024 19:44: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 4TKvYJ2NZYz45Mv; Wed, 24 Jan 2024 19:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oBMYe2IKvgEQ6CaUWofp0YNxjMc4o+XLZP4tpk6T0IE=; b=i1hH5h6JlsQ6mgFx9auFT3mUQdgqJ2yuw1Sbd3sW9v+/L9ODmWJnux1N+HMiF/1lpjDJaB OcSahkhGYCcqT4mW6hKWpSajRXvVbvnl4BuqSSziwhBoQB2KIm57/KTVSWNBptD3FrqIM9 0f3LqwxZyldXJuYfJq6yZjXkyXvKDpOPoVPllUlJ2zADrvSsgSVZFMUhUIXwjqrtfuw93o 0u9bVNZelZbp9Q1c9z/4zLPVT2lab702EX0dni/Nk/vHFCRwpdfiv1p6D9jrkbDuHmX3A4 xWm9eEOSBUyG5xwBrZM03zXLesKYWKqZpFdRfr0duipHJEAuoRudGhDmisv8ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oBMYe2IKvgEQ6CaUWofp0YNxjMc4o+XLZP4tpk6T0IE=; b=dQRu0X1Xpi2oPsMbO44rK2H95dX8ybFetgOHTXqZ+eh9jyvGeRtV88gWPBrEXsB8crF7mj ivbib59Fl6zNhCE1uSIZeWh99pCZQCBquRw3OGWwaRrHVilRuQl2Llklw96l7Qh0Cc06pt 5UsHCIkfQF08D4nWVKUqB9Zg5Qiiya/JJ6Ekis3A/iMlW32/QZdQCV0i4wt5hBmW+YFzKa E6HK2AK1RIyqAqg0bjeBOa5zt7SfrJGnobv+I67WIrAljnggZnFlH/nHXnwUrmGa+CR3Gr jQrlMIG0rWWH5jMCuFpGTbp6buIjB4SnEzwkXs0R1kYTrewmfHtJRTava9DuFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125476; a=rsa-sha256; cv=none; b=Xn3cLJn26kgqhMUjnzSqMPZnrtTMyeHH8ufz5yuTeANjEoou+tepVxarLaA5w54Bl9crjX eoRM4KtIBL21sOG3zUjgFfHttb9gnxhvSV365mqODglgxQUyIudwUK6tPoovpFkCqhHWsI WR6K2ycj01BQNbUF2swgwcCGBae8vwGxIV7PhIlMj/p0sF/eBbL7kQUluL9SfFXldzStU1 O+HCXLpohcuBHP59RdZoQLcWqkqlKSbQRXitqOlJB1EHfMwNYTCxpdCElknklaf2WLuiZQ 2RclD0XnfoW1f0nT695k/ZPdCXDXcfckG/2ODMTmt2SqAol3Y+q/qeLskwC74Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYJ1VvxzS8t; Wed, 24 Jan 2024 19:44: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 40OJiaj4005130; Wed, 24 Jan 2024 19:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiaFv005127; Wed, 24 Jan 2024 19:44:36 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:36 GMT Message-Id: <202401241944.40OJiaFv005127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 9b1a851e1ed0 - stable/14 - lib/libc/amd64/string: add strrchr scalar, baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9b1a851e1ed04d38736011c227e8f9494acec681 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=9b1a851e1ed04d38736011c227e8f9494acec681 commit 9b1a851e1ed04d38736011c227e8f9494acec681 Author: Robert Clausecker AuthorDate: 2023-10-12 05:37:41 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:26 +0000 lib/libc/amd64/string: add strrchr scalar, baseline implementation The baseline implementation is very straightforward, while the scalar implementation suffers from register pressure and the need to use SWAR techniques similar to those used for strchr(). Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42217 (cherry picked from commit 2ed514a220edbac6ca5ec9f40a3e0b3f2804796d) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strrchr.S | 209 +++++++++++++++++++++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 51645ba3b8af..2baa631fb3fa 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -16,6 +16,7 @@ MDSRCS+= \ strncmp.S \ strnlen.c \ strpbrk.c \ + strrchr.S \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/strrchr.S b/lib/libc/amd64/string/strrchr.S new file mode 100644 index 000000000000..e397bbcd3478 --- /dev/null +++ b/lib/libc/amd64/string/strrchr.S @@ -0,0 +1,209 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4,0x90 # 16-byte alignment, nop-filled + + .weak rindex + .set rindex, strrchr + +ARCHFUNCS(strrchr) + ARCHFUNC(strrchr, scalar) + ARCHFUNC(strrchr, baseline) +ENDARCHFUNCS(strrchr) + +ARCHENTRY(strrchr, scalar) + mov %edi, %ecx + and $~7, %rdi # align to 8 byte + movzbl %sil, %esi # clear stray high bits + movabs $0x0101010101010101, %r8 + mov (%rdi), %rax # load first word + imul %r8, %rsi # replicate char 8 times + + /* + * Unaligned input: align to 8 bytes. Then proceed the same + * way as with aligned input, but prevent matches before the + * beginning of the string. This is achieved by oring 0x01 + * into each byte of the buffer before the string + */ + shl $3, %ecx + mov %r8, %r10 + shl %cl, %r10 # 0x01 where the string is + xor %r8, %r10 # 0x01 where it is not + neg %r8 # negate 01..01 so we can use lea + movabs $0x8080808080808080, %r9 + + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + or %r10, %rax # ensure str != 0 before string + or %r10, %rcx # ensure str^c != 0 before string + bswap %rcx # in reverse order, to find last match + mov %rdi, %r10 # location of initial mismatch (if any) + xor %r11, %r11 # initial mismatch (none) + add $8, %rdi # advance to next iteration + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + not %rax # ~str + and %rdx, %rax # (str - 0x01..01) & ~str + and %r9, %rax # not including junk bits + jnz 1f # end of string? + + lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + mov %rcx, %r11 # remember mismatch in head + jmp 0f + + /* main loop unrolled twice */ + ALIGN_TEXT +3: lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + lea -8(%rdi), %rdx + cmovnz %rdx, %r10 # remember location of current mismatch + cmovnz %rcx, %r11 + +0: mov (%rdi), %rax # str + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + bswap %rcx # in reverse order, to find last match + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + not %rax # ~str + and %rdx, %rax # (str - 0x01..01) & ~str + and %r9, %rax # not including junk bits + jnz 2f # end of string? + + lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + cmovnz %rdi, %r10 # remember location of current mismatch + cmovnz %rcx, %r11 + + mov 8(%rdi), %rax # str + add $16, %rdi + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + bswap %rcx + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + not %rax # ~str + and %rdx, %rax # (str - 0x01..01) & ~str + and %r9, %rax # not including junk bits + jz 3b # end of string? + + /* NUL found */ +1: sub $8, %rdi # undo advance past buffer +2: lea (%rcx, %r8, 1), %rdx # (str ^ c) - 0x01..01 + not %rcx # ~(str ^ c) + and %rdx, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + and %r9, %rcx # not including junk bits + lea -1(%rax), %rdx + xor %rdx, %rax # mask of bytes in the string + bswap %rdx # in reverse order + and %rdx, %rcx # c found in the tail? + cmovnz %rdi, %r10 + cmovnz %rcx, %r11 + bswap %r11 # unreverse byte order + bsr %r11, %rcx # last location of c in (R10) + shr $3, %rcx # as byte offset + lea (%r10, %rcx, 1), %rax # pointer to match + test %r11, %r11 # was there actually a match? + cmovz %r11, %rax # if not, return null pointer + ret +ARCHEND(strrchr, scalar) + +ARCHENTRY(strrchr, baseline) + mov %edi, %ecx + and $~0xf, %rdi # align to 16 bytes + movdqa (%rdi), %xmm1 + movd %esi, %xmm0 + and $0xf, %ecx # offset from alignment + pxor %xmm2, %xmm2 + mov $-1, %edx + punpcklbw %xmm0, %xmm0 # c -> cc + shl %cl, %edx # bits corresponding to bytes in the string + punpcklwd %xmm0, %xmm0 # cc -> cccc + xor %r8, %r8 # address of latest match + mov $1, %esi # bit mask of latest match + mov %rdi, %r9 # candidate location for next match + add $16, %rdi # advance to next chunk + + /* check for match in head */ + pcmpeqb %xmm1, %xmm2 # NUL byte present? + pshufd $0, %xmm0, %xmm0 # cccc -> cccccccccccccccc + pcmpeqb %xmm0, %xmm1 # c present? + pmovmskb %xmm2, %eax + pmovmskb %xmm1, %ecx + and %edx, %ecx # c present in the string? + and %edx, %eax # NUL present in the string? + jnz .Lend2 + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa (%rdi), %xmm1 + test %ecx, %ecx # was there a match in the last iter.? + cmovnz %r9, %r8 # remember match if any + cmovnz %ecx, %esi + pxor %xmm2, %xmm2 + pcmpeqb %xmm1, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm1 # c present? + pmovmskb %xmm2, %eax + pmovmskb %xmm1, %ecx + test %eax, %eax # end of string in first half? + jnz .Lend + + movdqa 16(%rdi), %xmm1 + test %ecx, %ecx # was there a match in the last iter.? + cmovnz %rdi, %r8 # remember match if any + cmovnz %ecx, %esi + pxor %xmm2, %xmm2 + pcmpeqb %xmm1, %xmm2 # NUL byte present? + pcmpeqb %xmm0, %xmm1 # c present? + pmovmskb %xmm2, %eax + pmovmskb %xmm1, %ecx + lea 16(%rdi), %r9 + add $32, %rdi + test %eax, %eax # end of string in second half? + jz 0b + + ALIGN_TEXT +.Lend2: sub $16, %rdi +.Lend: lea -1(%rax), %edx + xor %edx, %eax # mask of bytes in the string + and %eax, %ecx # c found in the tail? + cmovnz %rdi, %r8 + cmovnz %ecx, %esi + bsr %esi, %esi # last location of c in (R8) + lea (%r8, %rsi, 1), %rax # pointer to match + ret +ARCHEND(strrchr, baseline) + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYK4xnMz58bqp; Wed, 24 Jan 2024 19:44: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 4TKvYK3lCfz45Vf; Wed, 24 Jan 2024 19:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX5ZEsfLFw6tAQ7du+BUX0WvR2x8M/ZEmbNo8y+OSVY=; b=CclZVb7BgsHFtsXFFei1nQZIaxzYOUmFpsDoE5spOh3ba0e5qjHeXdZML7QXGS4ga7+U5l MhId/Vh434Sa2emNpGlErsRogVZcqRTpcLOkG90WU2Nidy+LwivPPtP+BGYH2nLI9/N8Gn +Au7g4uc+O4S1BYC3sLjsj0S4Fwnth+pkE4kOnbXzH7rMr84OFkkisEbw+GFX9lnhlzFvA vizf73GwsTydM71d2QAdbb9RNzkozbjnw/DDLlxDSkwn9YtE1MMbliBYf0sN68p0LCU2Io jV5D7PyhB/HPK/i2UccOUBuWi21MVrb9JbY0UuZUe6cFB4B0S2UxF01L6WReuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX5ZEsfLFw6tAQ7du+BUX0WvR2x8M/ZEmbNo8y+OSVY=; b=jjSV1VEEu3GzpPkwMML19R/eNYNHBkS0gyi3LiOZp8YQ1+omUomEAkcsiC0pKxjqjuJMuN p73dXoKvov/R3lHoNt1TP/Gj6+kw6JB79J2exB4tQlvFULbNCevaCApFTCsBH0mazdaG7O D730kyGRE3vSjH4iGk1oaspijYGv0xtNcpE+CGBcyyjOH6DztzUrN/KchtmKm2erQo0/ez jbSClBX/iEm00wfKyLmEZXAdjAGAJYxIlt63YC/dxcLM8fkkSxJvQJdP8jeG3BXvJmLlDN 7ZKEQS+6L+92Eva8O8vbBWGEHSH5k2HjSyXCjEZLRqbRDjmSQHOfDyp+0v8YyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125477; a=rsa-sha256; cv=none; b=HoPdimEmSGdUvHW9frTyyhYtAugBn/3WPTjnTri70nzCT1Eg9xgKAuoAfhkz3gU97muoqU TKHOipvYbzD0Q9edxs2q7fINctS3XD+axtIvZ+ED3dPUbowZk9xsmJvwJwKWT4UEb7VMna wsdC1K878+dnhzsyNJdDnrl6U/OrUZojpE3coqzuyHgBM/BjoBrnZ3yAoSVGJwGR71I84x +iIrtfTwO8xKygMoIRgbHndJ4aLaPaZDQt/o4NgiVrPbogLXNaZV3RRnO02W5rb65mG9G7 5wfMXUAE7gwuREM384U4vOJWkQFXgya3eIDwZwrrmKSECZoZJvnE6z3RlVGoiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYK2kZFzS6M; Wed, 24 Jan 2024 19:44: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 40OJib6n005180; Wed, 24 Jan 2024 19:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJib9e005176; Wed, 24 Jan 2024 19:44:37 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:37 GMT Message-Id: <202401241944.40OJib9e005176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: c105cd8426bb - stable/14 - share/man/man7/simd.7: document strrchr scalar, baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c105cd8426bb0e100a4023898635c66bcea50e1f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=c105cd8426bb0e100a4023898635c66bcea50e1f commit c105cd8426bb0e100a4023898635c66bcea50e1f Author: Robert Clausecker AuthorDate: 2023-10-12 22:31:55 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:26 +0000 share/man/man7/simd.7: document strrchr scalar, baseline implementation Also mention missing rindex() entry, which is provided through strrchr(). Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42217 (cherry picked from commit dd1c2e887c1fa087bf15cbf7f0bdc35b7875bdd6) --- share/man/man7/simd.7 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 39642429c1c4..4e5c078a6e95 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd October 7, 2023 +.Dd October 12, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -63,7 +63,7 @@ Enhanced functions are present in the following architectures: .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV .It memset Ta Ta S Ta S Ta S -.It rindex Ta S +.It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta Ta Ta S1 .It strcat Ta Ta Ta S Ta S .It strchr Ta S Ta Ta S1 Ta S @@ -75,7 +75,7 @@ Enhanced functions are present in the following architectures: .It strncmp Ta Ta S Ta S1 Ta S .It strncpy Ta Ta Ta Ta Ta S2 .It strnlen Ta Ta Ta S1 -.It strrchr Ta S Ta Ta Ta S +.It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S From nobody Wed Jan 24 19:44:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYN0H9Yz58bdY; Wed, 24 Jan 2024 19:44: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 4TKvYM5QF8z45Xv; Wed, 24 Jan 2024 19:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqbZCI9ue6ac/L1WPu+RY3S4zGejaA/5wYynlDXc22A=; b=k+SAFvtQ1UyxzkcSlnL5dJTpyrAG1visV0aRgkamJM6iNM1Euz7+ir369z6/PzUnWizHIa cgj2rrjJjOJ/lGmvD3hDBH27Xyc2K64EwTPvrnyOfN94CGd52zBTa2QyLQgMB0CrCwd0IU tCCOfBXXmHEGstevNuEeadENQz3aYOV1D+Fbccardi7uZD0mkHexet1N4NSs1DqRIUendJ TCpXUtPBFofUClWUEcae7Um4YILeJ4E9R2YHFrAIXNDj0DxGdisNW0t7Yp3bR4LkkNID2V MWGel6PREUPoGvMAz1mUG44k99c4FfWD13R5UcLhFyoQtO3azvPqLPe7cOARng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqbZCI9ue6ac/L1WPu+RY3S4zGejaA/5wYynlDXc22A=; b=Vfem8tIDNFmrxY7eJY1lPm8ZxIrKsZc3ptOfjHowlBVEtYXThG5MbK9xnuzKr23Kxc5Pvr YpWKy/Fdw3lsTREvORhugAbNUGJznrefxn9Fe+5ZF8UEEH1elGdQGfm4RRTs8bCgooUrpw pWmU4sj/J4YQYRLFHHmL8PThtOqHSfezdP2t1YMt7sYWZ2V5vjH3MWaDg5ow/OxmqHPSA4 zyCHZJjxW5DL+1RGTqOJke9hylJqWc28f8CI0V8F+EYBG1Sb1+LUkf0YFw3sLCoAxSa3V3 P0boUYY142+CxOQu8F/h+7Lu8dlk44TZomGGA0COkAiEKX6hLndo1mezbqB2pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125479; a=rsa-sha256; cv=none; b=qqDKHoByKmjf92P5msTnZSc2NOz5TIk6JAlsvb/zQAgeOFw8z7MZXbJWnbjgoPxeG1QCE5 uDHXR87hjdEKVYdzJVqvPPnaR1o4jhiB+ahl4RLvQpQCXet/aLLqjA1AnAYnazx3eLFANA M+xZUpOEUrsPziPyEEHFJNV6BzGNv//F7yMsBJ5WVI42B5HMEMt3vVfeLyDuf52TchRjWK xgdz/fBIbCs7gBDPwQnZ8LrZ/eaX80IxT1GuoITmJEZ4fHh8qhuV+5JcImzso16MivDKFi +I+vrzrUTzTJ7Mf5eWBnGSKsdZ3AExAO5WlAr9pPPm5swSiVj42aBTXBCYbfGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYM4WsLzRmt; Wed, 24 Jan 2024 19:44: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 40OJidmF005277; Wed, 24 Jan 2024 19:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJid70005274; Wed, 24 Jan 2024 19:44:39 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:39 GMT Message-Id: <202401241944.40OJid70005274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 8dc035482310 - stable/14 - share/man/man7/simd.7: document amd64 SIMD use for strsep() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8dc0354823104385e8a0cb217264e07680e8fdfa Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=8dc0354823104385e8a0cb217264e07680e8fdfa commit 8dc0354823104385e8a0cb217264e07680e8fdfa Author: Robert Clausecker AuthorDate: 2023-10-24 03:57:56 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:26 +0000 share/man/man7/simd.7: document amd64 SIMD use for strsep() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42346 (cherry picked from commit 75cb202698a65cb809eb2fea194a73e79c509d9c) --- share/man/man7/simd.7 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 4e5c078a6e95..4437d025394f 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd October 12, 2023 +.Dd October 23, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -77,6 +77,7 @@ Enhanced functions are present in the following architectures: .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 +.It strsep Ta Ta Ta S2 .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S .It timingsafe_bcmp Ta Ta Ta S1 From nobody Wed Jan 24 19:44:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYM1SM5z58bbV; Wed, 24 Jan 2024 19:44: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 4TKvYL4d56z45mK; Wed, 24 Jan 2024 19:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrzbsZ93eGgsfc6aFhnRRVArk7y6epf+Y5mrwirMVyE=; b=LE/wdcWZpnHi2gcy9aDW7eJtuavF7RK+rXlOggzQlZm/RFYbqRzEnU8Y4yuOj1s0DEmPig yQ/YFxenexTQxhk70/vHa6/C/w9nmHaLGf4mUdg3IFRVVAef1Ef7ylHnzg+3vK3AwKt/Ap DeC01qy8wBySWs5mhiie3vny7ogzWWxp3+RF/RNWjZxRF8L9ddffatX/noWMgbltJfp0Q7 Me0g4dbohcMI7elDvtEyQMrueOcFw4iO12mUXfegxg4IdDiqEhcZahbF5OzHGco2VNl2YX hXr+pKiDAEclq0W6+o6GH7ALXExn1dENyS9ghN6Yyt8t3IKUin52j6ewaY5IsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrzbsZ93eGgsfc6aFhnRRVArk7y6epf+Y5mrwirMVyE=; b=SROpn8gVvQ31GIRgmj5tqm6WmOjE5xlWSdt/kJ+wJQoLaACxBF2lMZGxJK5g5hpKA2CYpz FJB2HSQxvcTvZjwXWyPLO1IUcFG7HvmRGvsc54mSOtRNBn4A+8F/L0Me5XeYoWdwwh6MPe lJ/6vI9SoeEjW2E82oU7tw8fImMGgAWwj9Xp6IW8y+dMDrqJWrIW1AVcZB/i1vrsvyddh4 /gI91LT5NP9TP+QBq34koFJ3aeFEBpKS7uqIiLUApKqKHyZopF/k75OE3ulyTvzmKMcG96 TBYabdQMYqVhetmsnlc2EBzSS5DwLxXxAJLa1DV47v35Z4lD2T/F+5zUMJhOPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125478; a=rsa-sha256; cv=none; b=NQ9cdT52xci+cty2KXpolf6PPXeaeLblSMhROHIQgqu0LKB1wGGAxg13HH4OpNBVEPjt93 12fZ2xUFE+03WXtnhq+Fu5m0KgsQC1xc8h2gNh3n6sUTNE2SSRrl1coxvnZchrVt4XMZkf jlkfuEjNwBPQYn4AmHfhzWX/o0zqHlha3kpC57JKK3F8kKFoNQWifBXhghteoye/J50dyG re5ybAZQlenz6SXUlY06MRjVxx8y+Fr1MVBZKtEk0TBa3thXkN6SRRkQXgpfkzpj9zN/bf zDU8NAyJNFYJiZEH4V2DrGHDkJKSZDqvSVxNPOfHJvexcj+TsS6V72ympGzlRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYL3kfnzRkL; Wed, 24 Jan 2024 19:44: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 40OJicuh005225; Wed, 24 Jan 2024 19:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJicwC005222; Wed, 24 Jan 2024 19:44:38 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:38 GMT Message-Id: <202401241944.40OJicwC005222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 265fb89aba2a - stable/14 - lib/libc/amd64/string: implement strsep() through strcspn() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 265fb89aba2a6504f0a055e47ce6a72b1eecacf1 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=265fb89aba2a6504f0a055e47ce6a72b1eecacf1 commit 265fb89aba2a6504f0a055e47ce6a72b1eecacf1 Author: Robert Clausecker AuthorDate: 2023-10-24 03:52:01 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:26 +0000 lib/libc/amd64/string: implement strsep() through strcspn() The strsep() function is basically strcspn() with extra steps. On amd64, we now have an optimised implementation of strcspn(), so instead of implementing the inner loop manually, just call into the optimised routine. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42346 (cherry picked from commit fd2ecd91aeeeab579c769c9a39f90b4bd4a493a9) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strsep.c | 57 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 2baa631fb3fa..ee396f98eccc 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -17,6 +17,7 @@ MDSRCS+= \ strnlen.c \ strpbrk.c \ strrchr.S \ + strsep.c \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/strsep.c b/lib/libc/amd64/string/strsep.c new file mode 100644 index 000000000000..9fda56d7e135 --- /dev/null +++ b/lib/libc/amd64/string/strsep.c @@ -0,0 +1,57 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 + */ + +#include +#include + +size_t __strcspn(const char *, const char *); + +/* + * We have a fast strcspn() on amd64. Use it over a direct + * implementation of strsep for better performance. + */ +char * +strsep(char **stringp, const char *delim) +{ + size_t n; + char *s; + + s = *stringp; + if (s == NULL) + return (NULL); + + n = __strcspn(s, delim); + if (s[n] == '\0') + *stringp = NULL; + else { + s[n] = '\0'; + *stringp = s + n + 1; + } + + return (s); +} From nobody Wed Jan 24 19:44:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYP1cpvz58btB; Wed, 24 Jan 2024 19:44: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 4TKvYN6hk9z45kf; Wed, 24 Jan 2024 19:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=egIk7kgjFoheXFbr6n3cMJ1WolElWdNzIdtzMaCEasg=; b=cELJb5P5nUcgazaMIEToiL/zepQRTMWX8gje580fn3y98d1UelEPol4gq9Ktkqwp6N8s0A cely93lJbCt9bANmT2HgryOgUyw32GX6mPTXQYPAJpwy+gU/oM3zY8kVxV7y5/TFnmIdjn sO2kJb3eW7Fe8/GiivxaOf/H9TaZFxNosSZe6L6r6fPebN9ilOwMIZ1xD7ibrADIrM4hx4 KJTOxEW1+9a08su1gZErPqVCUHkoO+VLxDtDwdt/lyU9xBXUzu1lCdTIOzqMr7m4EBHuyy +CgOeIntbmy9+FIFgMpYJfxYTaPiIK1xPNBtBmgZsQX0xfq8Ia2B6JATB0amQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=egIk7kgjFoheXFbr6n3cMJ1WolElWdNzIdtzMaCEasg=; b=ykH2zQlRugvSJPD/7JJwH7cokem6+3DDZmm0mpM/C6q10HgwwKK7aKsxnAudDrWLsgr6aw NvrOCPMQOrX+j8SrqGJCECU+KiAOlN1CxMh9JPZC7+XzXF8Bh2b73Z+NhoF1/kn0/P0re2 8Yu7Y979HFdAs04bY0TRnG6RfW8FJbe/AOc9Qw3Nh2PwH67yLe+ovqVLjaniXhOTND3e/1 DhBvW+epGYr3EpTPIb3jOt91/1as9WAmhBvRc/jS/jW+eGNyWQ6ZGSgRtF338r+mlvorTN Cez8EvUudwKrB0esGjP+y5yxdNpkQ0ktpZFxq9jxikNiiIol6xYFn45/Y9NsHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125480; a=rsa-sha256; cv=none; b=eXjX1Avfun1kebv/5FP6uqUYHWon/fGi4NKd+R8QY8y9RXkYwac70K/YAO+nIfwfRPgIdv lj9J8/puqunvUnQhS/jGotTZ2MdT7KJWbb9WxvMyLziChTft/JwnCIKZrykwqbbMTFTt5g HHAAsFABI8wAd3Uj/mK0O2aYeqOwETHgy0MoT+1OsRvBh9GsMmDco7JwuD1093kTZD4pGS ZZ1nVKcrU5ogAuMjQmkhykyVPKHNhw963J4ol8j36icAeftO4I46qaboHYA20JtDTzAWZ6 DTqVMcyfchFuVm3dN9dMylPQsIuFLHYo5avfXH81yO50EoI57r5ijryjGPtnJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYN5pgzzRkM; Wed, 24 Jan 2024 19:44: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 40OJiexb005324; Wed, 24 Jan 2024 19:44:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJieKH005320; Wed, 24 Jan 2024 19:44:40 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:40 GMT Message-Id: <202401241944.40OJieKH005320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 438a1ff803a5 - stable/14 - lib/libc/tests/string/stpncpy_test.c: extend for upcoming SSE implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 438a1ff803a5d033b80b16880b2718f1402d904f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=438a1ff803a5d033b80b16880b2718f1402d904f commit 438a1ff803a5d033b80b16880b2718f1402d904f Author: Robert Clausecker AuthorDate: 2023-11-05 04:02:00 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:27 +0000 lib/libc/tests/string/stpncpy_test.c: extend for upcoming SSE implementation This adds additional unit tests validating the function for All possible alignment offsets of source and destination. Also extend the test to allow testing of an external stpncpy implementation, which greatly simplifies the development of custom implementations. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 (cherry picked from commit 6fa9e7d8737548ef93c573387ce62402c368d486) --- lib/libc/tests/string/stpncpy_test.c | 99 +++++++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 14 deletions(-) diff --git a/lib/libc/tests/string/stpncpy_test.c b/lib/libc/tests/string/stpncpy_test.c index 8154237eb8c2..8574b2d591be 100644 --- a/lib/libc/tests/string/stpncpy_test.c +++ b/lib/libc/tests/string/stpncpy_test.c @@ -1,7 +1,11 @@ /*- * Copyright (c) 2009 David Schultz + * Copyright (c) 2023 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,12 +31,15 @@ #include #include #include +#include #include #include #include #include +static char *(*stpncpy_fn)(char *restrict, const char *restrict, size_t); + static char * makebuf(size_t len, int guard_at_end) { @@ -69,7 +76,7 @@ test_stpncpy(const char *s) dst = makebuf(bufsize, j); memset(dst, 'X', bufsize); len = (bufsize < size) ? bufsize : size - 1; - assert(stpncpy(dst, src, bufsize) == dst+len); + assert(stpncpy_fn(dst, src, bufsize) == dst+len); assert(memcmp(src, dst, len) == 0); for (x = len; x < bufsize; x++) assert(dst[x] == '\0'); @@ -78,33 +85,97 @@ test_stpncpy(const char *s) } } -ATF_TC_WITHOUT_HEAD(nul); -ATF_TC_BODY(nul, tc) +static void +test_sentinel(char *dest, char *src, size_t destlen, size_t srclen) { + size_t i; + const char *res, *wantres; + const char *fail = NULL; + + for (i = 0; i < srclen; i++) + /* src will never include (){} */ + src[i] = '0' + i; + src[srclen] = '\0'; + + /* source sentinels: not to be copied */ + src[-1] = '('; + src[srclen+1] = ')'; + + memset(dest, 0xee, destlen); + + /* destination sentinels: not to be touched */ + dest[-1] = '{'; + dest[destlen] = '}'; + + wantres = dest + (srclen > destlen ? destlen : srclen); + res = stpncpy_fn(dest, src, destlen); + + if (dest[-1] != '{') + fail = "start sentinel overwritten"; + else if (dest[destlen] != '}') + fail = "end sentinel overwritten"; + else if (strncmp(src, dest, destlen) != 0) + fail = "string not copied correctly"; + else if (res != wantres) + fail = "incorrect return value"; + else for (i = srclen; i < destlen; i++) + if (dest[i] != '\0') { + fail = "incomplete NUL padding"; + break; + } - test_stpncpy(""); + if (fail) + atf_tc_fail_nonfatal("%s\n" + "stpncpy(%p \"%s\", %p \"%s\", %zu) = %p (want %p)\n", + fail, dest, dest, src, src, destlen, res, wantres); } -ATF_TC_WITHOUT_HEAD(foo); -ATF_TC_BODY(foo, tc) +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) { - - test_stpncpy("foo"); + ATF_CHECK_EQ(stpncpy_fn(NULL, NULL, 0), NULL); } -ATF_TC_WITHOUT_HEAD(glorp); -ATF_TC_BODY(glorp, tc) +ATF_TC_WITHOUT_HEAD(bounds); +ATF_TC_BODY(bounds, tc) { + size_t i; + char buf[64+1]; - test_stpncpy("glorp"); + for (i = 0; i < sizeof(buf) - 1; i++) { + buf[i] = ' ' + i; + buf[i+1] = '\0'; + test_stpncpy(buf); + } +} + +ATF_TC_WITHOUT_HEAD(alignments); +ATF_TC_BODY(alignments, tc) +{ + size_t srcalign, destalign, srclen, destlen; + char src[15+3+64]; /* 15 offsets + 64 max length + NUL + sentinels */ + char dest[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + + for (srcalign = 0; srcalign < 16; srcalign++) + for (destalign = 0; destalign < 16; destalign++) + for (srclen = 0; srclen < 64; srclen++) + for (destlen = 0; destlen < 64; destlen++) + test_sentinel(dest+destalign+1, + src+srcalign+1, destlen, srclen); } ATF_TP_ADD_TCS(tp) { + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + stpncpy_fn = dlsym(dl_handle, "test_stpncpy"); + if (stpncpy_fn == NULL) + stpncpy_fn = stpncpy; - ATF_TP_ADD_TC(tp, nul); - ATF_TP_ADD_TC(tp, foo); - ATF_TP_ADD_TC(tp, glorp); + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, bounds); + ATF_TP_ADD_TC(tp, alignments); return (atf_no_error()); } From nobody Wed Jan 24 19:44:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYQ3Dpfz58bbW; Wed, 24 Jan 2024 19:44: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 4TKvYQ0bLWz45pq; Wed, 24 Jan 2024 19:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MGIoiRuXWQn9n/EV/T13VQjb6CURt3kLbRgQqJynBs0=; b=DNS87sXw72qXLIpqpTXbT42wSTt99ErIeph8s16Tk/c5I3JCfti/aF0xQJI5dH0Xu6wHIG JaXlAKyY+D5PXLzdkW/wXwuF0auAvYgjdVR2Oeg9IGvYMQlW+efp0FGP2vt5Y4P2vjCDxO WyDU6VYJCkRN1O7Ls4AfBWXkuYLUeY3RT8XrZg+xabLx57VtNBnHg4YZdbrFKImdyYw+bI 8zndIAurtgAN1+zhQcIA9a+BvYflCAv04+CXDarnP4C6LQVpFdnVkl+xJgz/U3KHbvRiTE h1VSuJ/AWxhQGU5tRvdGaSeLq7JXPwmzhMUEiEUf6iMAIwmzWwCG0CRmE3lmqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MGIoiRuXWQn9n/EV/T13VQjb6CURt3kLbRgQqJynBs0=; b=NkhuAEFOZmCyl0Ph8b1f2vlxgWMZd7sXJL8Lbn7Tg1P8T+kphFzaSApeZb5toFUkjd+yHe pUg7+xiw4zAyvxJ4NAwImv0nubXdXFaZDllD2GNQvQz5cF5pFljx/2hpb+YwBsuUDBBzKs ke/a5DD3+yK52Mq/B0q+IBB2oU6q5qDT1qs25Ir7Vwhsu0ePx2UF4RZovbTn3kwmmXT46E Y358IpOeUjbvTnt6d5X7dz7bPD66zIfulJo7xpNA0sOnr1sJAlJjMTykXMw1acO74/ET2P wozz0zuZ04ucLqVLbNWrCLKKiCdipHxRV/aD1WFPLUGHUEHJMMaxLDRtAezvhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125482; a=rsa-sha256; cv=none; b=KWTxGkVzsHDq5tMIs6yaBmA03hCGGoXtdRE2HFGakwdzmOyXOjVYCeLcgTTZEn5kNwLlLA p7aWbCjfHx6ga+9j1FWZaqumLgV7M2NIPLWcCAXDEIPbmw/83fsDtvIif4qP184OTMX1QG GSuCJ+vu5UoQO7rQ2dFdbSFJmHMvxKYQq9+9CxUlk5zMZKJixMFJ7u1QMIOzPkWkzeYeW1 H7HB/q/0IG5VVTfz/nuuuOiRE+/v43s6tYdfNPyElRndxKmFpH6BlngjRt1eDk0YjDTvBX nxD0xvkut/qRf3Xp5QpU8MJGaLNjVSAYIBjXobIvrn+5u9jj3dnvMBIMVVHf0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYP6pYkzRkN; Wed, 24 Jan 2024 19:44: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 40OJiftO005378; Wed, 24 Jan 2024 19:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJifLp005375; Wed, 24 Jan 2024 19:44:41 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:41 GMT Message-Id: <202401241944.40OJifLp005375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 7527fecbfe0c - stable/14 - lib/libc/amd64/string: add stpncpy scalar, baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7527fecbfe0c7b8c9f8515ca92f9c936e687ec9d Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=7527fecbfe0c7b8c9f8515ca92f9c936e687ec9d commit 7527fecbfe0c7b8c9f8515ca92f9c936e687ec9d Author: Robert Clausecker AuthorDate: 2023-10-30 03:15:46 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:27 +0000 lib/libc/amd64/string: add stpncpy scalar, baseline implementation This was surprisingly annoying to get right, despite being such a simple function. A scalar implementation is also provided, it just calls into our optimised memchr(), memcpy(), and memset() routines to carry out its job. I'm quite happy with the performance. glibc only beats us for very long strings, likely due to the use of AVX-512. The scalar implementation just calls into our optimised memchr(), memcpy(), and memset() routines, so it has a high overhead to begin with but then performs ok for the amount of effort that went into it. Still beats the old C code, except for very short strings. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 (cherry picked from commit 90253d49db09a9b1490c448d05314f3e4bbfa468) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/stpncpy.S | 283 +++++++++++++++++++++++++++++++++++++ 2 files changed, 284 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index ee396f98eccc..cc8b0e825e3e 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -7,6 +7,7 @@ MDSRCS+= \ memmove.S \ memset.S \ stpcpy.S \ + stpncpy.S \ strcat.S \ strchrnul.S \ strcmp.S \ diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S new file mode 100644 index 000000000000..5ce0dd093a9e --- /dev/null +++ b/lib/libc/amd64/string/stpncpy.S @@ -0,0 +1,283 @@ +/* + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + + .weak stpncpy + .set stpncpy, __stpncpy +ARCHFUNCS(__stpncpy) + ARCHFUNC(__stpncpy, scalar) + ARCHFUNC(__stpncpy, baseline) +ENDARCHFUNCS(__stpncpy) + +ARCHENTRY(__stpncpy, scalar) + push %rbp # establish stack frame + mov %rsp, %rbp + + push %rdx + push %rdi + push %rsi + push %rax # dummy push for alignment + + mov %rsi, %rdi + xor %esi, %esi + call CNAME(__memchr) # memchr(src, '\0', len) + pop %rcx # dummy pop + pop %rsi + mov -16(%rbp), %rdi + + test %rax, %rax # NUL found? + jz .Lfullcopy + + mov %rax, %rdx + sub %rsi, %rdx # copy until the NUL byte + add %rdx, -16(%rbp) # advance destination by string length + sub %rdx, -8(%rbp) # and shorten buffer size by string length + call CNAME(memcpy) + + pop %rdi + pop %rdx + xor %esi, %esi + pop %rbp + jmp CNAME(memset) # clear remaining buffer + +.Lfullcopy: + mov -8(%rbp), %rdx + call CNAME(memcpy) # copy whole string + add -8(%rbp), %rax # point to dest[n] + leave + ret +ARCHEND(__stpncpy, scalar) + + /* + * this mask allows us to generate masks of 16-n 0xff bytes + * followed by n 0x00 bytes by loading from .Lmask+n. + */ + .section .rodata +.Lmask: .quad 0xffffffffffffffff + .quad 0xffffffffffffffff + .quad 0x0000000000000000 + .quad 0x0000000000000000 + +/* stpncpy(char *restrict rdi, const char *rsi, size_t rdx) */ +ARCHENTRY(__stpncpy, baseline) +#define bounce (-3*16-8) /* location of on-stack bounce buffer */ + + test %rdx, %rdx # no bytes to copy? + jz .L0 + + mov %esi, %ecx + and $~0xf, %rsi # align source to 16 bytes + movdqa (%rsi), %xmm0 # load head + and $0xf, %ecx # offset from alignment + mov $-1, %r9d + lea -32(%rcx), %rax # set up overflow-proof comparison rdx+rcx<=32 + shl %cl, %r9d # mask of bytes belonging to the string + sub %rcx, %rdi # adjust RDI to correspond to RSI + pxor %xmm1, %xmm1 + movdqa %xmm0, bounce(%rsp) # stash copy of head on the stack + pcmpeqb %xmm1, %xmm0 + pmovmskb %xmm0, %r8d + + lea (%rdx, %rcx, 1), %r10 # buffer length from alignment boundary + add %rdx, %rax # less than 2 chunks (32 bytes) to play with? + jnc .Lrunt # if yes, use special runt processing + + movdqu %xmm1, -16(%rdi, %r10, 1) # clear final bytes of destination + and %r9d, %r8d # end of string within head? + jnz .Lheadnul + + movdqu (%rsi, %rcx, 1), %xmm2 # load head from source buffer + movdqu %xmm2, (%rdi, %rcx, 1) # an deposit + + add $16, %rsi + add $16, %rdi + sub $32, %r10 + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa (%rsi), %xmm0 + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %r8d + test %r8d, %r8d + jnz 3f + + movdqu %xmm0, (%rdi) + cmp $16, %r10 # more than a full chunk left? + jbe 1f + + movdqa 16(%rsi), %xmm0 + add $32, %rdi # advance pointers to next chunk + add $32, %rsi + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %r8d + test %r8d, %r8d + jnz 2f + + movdqu %xmm0, -16(%rdi) + sub $32, %r10 # more than another full chunk left? + ja 0b + + sub $16, %rdi # undo second advancement + sub $16, %rsi + add $16, %r10d # restore number of remaining bytes + + /* 1--16 bytes left but string has not ended yet */ +1: pxor %xmm1, %xmm1 + pcmpeqb 16(%rsi), %xmm1 # NUL byte in source tail? + pmovmskb %xmm1, %r8d + bts %r10d, %r8d # treat end of buffer as NUL + tzcnt %r8d, %r8d # where is the NUL byte? + movdqu (%rsi, %r8, 1), %xmm0 # load source tail before NUL + lea 16(%rdi, %r8, 1), %rax # point return value to NUL byte + # or end of buffer + movdqu %xmm0, (%rdi, %r8, 1) # store tail into the buffer + ret + +2: sub $16, %rdi # undo second advancement + sub $16, %rsi + sub $16, %r10 + + /* string has ended and buffer has not */ +3: tzcnt %r8d, %r8d # where did the string end? + lea .Lmask+16(%rip), %rcx + lea (%rdi, %r8, 1), %rax # where the NUL byte will be + neg %r8 + movdqu (%rcx, %r8, 1), %xmm1 # mask with FF where the string is, + # 00 where it is not + pand %xmm1, %xmm0 # mask out bytes after the string + movdqu %xmm0, (%rdi) # store masked current chunk + pxor %xmm1, %xmm1 + sub $16, %r10 # another full chunk left? + jbe 1f + + /* clear remaining destination buffer (tail has been cleared earlier) */ + ALIGN_TEXT +0: movdqu %xmm1, 16(%rdi) + cmp $16, %r10 + jbe 1f + + movdqu %xmm1, 32(%rdi) + add $32, %rdi + sub $32, %r10 + ja 0b + +1: ret + + /* at least two chunks to play with and NUL while processing head */ +.Lheadnul: + movdqu bounce(%rsp, %rcx, 1), %xmm0 # load start of source from stack + tzcnt %r8d, %r8d # find location of NUL byte + movdqu %xmm0, (%rdi, %rcx, 1) # deposit head in the destination + movdqu %xmm1, (%rdi, %r8, 1) # clear out following bytes + movdqu %xmm1, 16(%rdi) # clear out second chunk + lea (%rdi, %r8, 1), %rax # make RAX point to the NUL byte + + add $32, %rdi # advance past first two chunks + sub $32+16, %r10 # advance past first three chunks + jbe 1f # did we pass the end of the buffer? + + /* clear remaining destination buffer (tail has been cleared earlier) */ + ALIGN_TEXT +0: movdqu %xmm1, (%rdi) # clear out buffer chunk + cmp $16, %r10 + jbe 1f + + movdqu %xmm1, 16(%rdi) + add $32, %rdi + sub $32, %r10 + ja 0b + +1: ret + + /* 1--32 bytes to copy, bounce through the stack */ +.Lrunt: movdqa %xmm1, bounce+16(%rsp) # clear out rest of on-stack copy + bts %r10d, %r8d # treat end of buffer as end of string + and %r9w, %r8w # end of string within first buffer? + jnz 0f # if yes, do not inspect second buffer + + movdqa 16(%rsi), %xmm0 # load second chunk of input + movdqa %xmm0, bounce+16(%rsp) # stash copy on stack + pcmpeqb %xmm1, %xmm0 # NUL in second chunk? + pmovmskb %xmm0, %r9d + shl $16, %r9d + or %r9d, %r8d # merge found NUL bytes into NUL mask + + /* end of string after one buffer */ +0: tzcnt %r8d, %r8d # location of last char in string + movdqu %xmm1, bounce(%rsp, %r8, 1) # clear bytes behind string + lea bounce(%rsp, %rcx, 1), %rsi # start of string copy on stack + lea (%rdi, %r8, 1), %rax # return pointer to NUL byte + + cmp $16, %edx # at least 16 bytes to transfer? + jae .L1631 + + mov (%rsi), %r8 # load string head + cmp $8, %edx # at least 8 bytes to transfer? + jae .L0815 + + cmp $4, %edx # at least 4 bytes to transfer? + jae .L0407 + + movzwl -2(%rsi, %rdx, 1), %esi # load last two bytes of string + mov %r8b, (%rdi, %rcx, 1) # store first byte + + cmp $2, %edx # at least 2 bytes to transfer? + jb .L1 + + mov %si, -2(%rdi, %r10, 1) # store last two bytes of string +.L1: ret + +.L1631: movdqu (%rsi), %xmm0 # load first 16 bytes of string + movdqu -16(%rsi, %rdx, 1), %xmm1 # load last 16 bytes of string + movdqu %xmm0, (%rdi, %rcx, 1) + movdqu %xmm1, -16(%rdi, %r10, 1) + ret + +.L0815: mov -8(%rsi, %rdx, 1), %rdx # load last 8 bytes of string + mov %r8, (%rdi, %rcx, 1) + mov %rdx, -8(%rdi, %r10, 1) + ret + +.L0407: mov -4(%rsi, %rdx, 1), %edx # load last four bytes of string + mov %r8d, (%rdi, %rcx, 1) + mov %edx, -4(%rdi, %r10, 1) + ret + + /* length 0 buffer: just return dest */ +.L0: mov %rdi, %rax + ret +ARCHEND(__stpncpy, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYR3yK7z58bdc; Wed, 24 Jan 2024 19:44: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 4TKvYR1h0Wz45Yv; Wed, 24 Jan 2024 19:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mwWIMsA8EW2p6ZJTe6rik4Nw5HAxOOWKM7iyAGNVZM=; b=umJZ808btVxoQ3CwWvD94u21YMBIiDXwPT8kBiWFoYzYQ2gBtfhIEHliLC2x2jGZxwVYHA AXyV14wNxroP3VfboIz0cTa0NSoE5MUpq4/gQOFF5SWStvW3JDi5ESCmmE+Qw5POkEG1p7 byfDwseUsKgnHTXGB4mdRZRKE0maMSw9IsrXiANtsoYRUtNEfpSH2Sa8oC/FLfQttinSA+ vunwOL+xh9vyheVppNgVBgThaQh3qhFzsWC/EClnpv1A/45cgPDGj5r62eZeejW+ni8e3X 7CSx+Q2exeiaPdRX8xA78btTMzscDAFjpoxoUzWLV+mZfyif1Qr3Zry9+U1rxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mwWIMsA8EW2p6ZJTe6rik4Nw5HAxOOWKM7iyAGNVZM=; b=YvxUJO/ITqpowus2V/P4xwxKnthxTKi5JzfzPhX7Z9wtmz8EqPmiJHvunhBKvDYl9pFIVA crT58i7q46P0CK1s5u/wqhH9OZbG84oQkqs5TVJ9olLMrAR+lqPndD3HwEjb9azX2b8Pe8 mGTvgA6NfkxGq4k0liYfgjGSgDCSyy4OCc+ewAzagBhS4L73nboAMnv9HRh9evtwVd19lG 1MDkm5LhMphZLPJp9ZsFLTCadpdxgTJ58EBa86MdRI8a0rmL3P9CT+09MRFR2M3UNzzosM 8iZSEV4hTU3xV7wH0+Y2WDm9E7cXW/p5YvuZB7M0SynbOALJtZdhE5tuRpZwNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125483; a=rsa-sha256; cv=none; b=rCeHVIGtHrD0FC4TEwtE4GCbUUnrngWvnc4PllkkYAvSYuQzgbKDmK21BEhErIztj9YyAf 3hZpoMbO5j5tKq0TI8bLM3M5aTD2JZKbpUzmIs374Y+iEOE97G4btHtI0M/UrTo1SYx57O qKcmPVuNHUxy6otB+S/knQ84S9ERdrl5c8GUo4qsYfFduEyOSsyKlzrs4sTEP1fY2b8qbg paQjDCXVF2cb9PcLvSw/GHMHLw52Uwv+IzIo0MuchZCiyI/7WoRsJ0eB+ik5fcoRdD7oMZ QnvXqZbIa9keGqDWbu1vtAE+vmdXr0p+8Si7wz3gZfTRsMB0G9vEdwQWVA9VQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYR0kGyzS8v; Wed, 24 Jan 2024 19:44: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 40OJihF5005423; Wed, 24 Jan 2024 19:44:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJihde005420; Wed, 24 Jan 2024 19:44:43 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:43 GMT Message-Id: <202401241944.40OJihde005420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 76f9afcdcfa4 - stable/14 - lib/libc/amd64/string: implement strncpy() by calling stpncpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 76f9afcdcfa482d81d5f3017f29c087fe795bb4f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=76f9afcdcfa482d81d5f3017f29c087fe795bb4f commit 76f9afcdcfa482d81d5f3017f29c087fe795bb4f Author: Robert Clausecker AuthorDate: 2023-11-09 04:25:55 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:27 +0000 lib/libc/amd64/string: implement strncpy() by calling stpncpy() Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 (cherry picked from commit e19d46c808267f53455e96a28ff7654211523d2c) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncpy.c | 41 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index cc8b0e825e3e..d982061e080b 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -15,6 +15,7 @@ MDSRCS+= \ strcspn.S \ strlen.S \ strncmp.S \ + strncpy.c \ strnlen.c \ strpbrk.c \ strrchr.S \ diff --git a/lib/libc/amd64/string/strncpy.c b/lib/libc/amd64/string/strncpy.c new file mode 100644 index 000000000000..b3d868787fbe --- /dev/null +++ b/lib/libc/amd64/string/strncpy.c @@ -0,0 +1,41 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 + */ + +#include +#include + +char *__stpncpy(char *restrict, const char *restrict, size_t); + +char * +strncpy(char *restrict dst, const char *restrict src, size_t len) +{ + + __stpncpy(dst, src, len); + + return (dst); +} From nobody Wed Jan 24 19:44:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYS6GYgz58bqx; Wed, 24 Jan 2024 19:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYS2ytrz45cH; Wed, 24 Jan 2024 19:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ8/mXJC7eYxiOFsFvhfPwakIMvznnGy2UkAmD2r1T8=; b=qRzX1yB0iHDwXRVpjqZ1ku5TutsAdPMYJs8PfYIW9uGotPjGC9MRy0eJVaEePbvaf8t3r8 7LZvCPHObxmoRMWEYpYSDz9ljAxxD8ETKbwf++aDhPCcAWkVOYAv0+Jv+1T/7SGMLPu3bj +Is1zYNHEh/KzWj+02FEwOEfclEaZxxgWwsna0/oFVQVX+MRCnehe2Qplmd6jfbgs/cYGE uZ3yVdxbYIGDLOFrWnl9xjopmAPbiMCVSEIxVb1nEaJoafhCnNXvPt446RgNXWbAwVPXQm QPf/gZSpRKho1HzOXxvvIDXsoVS1EGQvmqT/d01Ww+X4rViIU7UD4vobBf/ILA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ8/mXJC7eYxiOFsFvhfPwakIMvznnGy2UkAmD2r1T8=; b=tL2gPVTKDgHFNUj4OfGx8+p0ZL5z+xmIre1UZLdAarbZapBZJMxHG8cg76xhTxQg3Y8d/c G5kk3SEOvOCark3fUwc8XbrfOTUTzP+CiztJg1zED07L1As9AJ0Nwfx357ZEZil35ZB0++ UmQmGHGEUrJeYudwSL/pUfP0N1KZ+AVm+Dq7XTjZonvA0EKNQyUKm+fc+6qzfwCrJ7jF6a dHXNIioKn5c6rRlhIJsWyKcpIP70mBBnvCBZ8n8JEIa1K/TNPnr+efZ34xQ8NtQuX6Ftw2 uyshz1edlVHaZTDqFzyJEOxZF+lmLl56AivUS0sFMxucxMI3ejMP0xML2ObDcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125484; a=rsa-sha256; cv=none; b=Y9bePtbJOtJQAusqPXohiGAnMvba2f4liyLeE19wcfHq/mBEdtCEoxGtRvDlJEodmha7e7 rdC6dKAhw4qEO0iqlPSPUL86ctxA2g/sEh5dI34DsLYeETgbHr/VqeiP3OPXTbk1M8x13h +pHQm85RG2pU6Mwmqxl0hfPJpEcP1YxQrfYWsLPTVca3B5wFZVBuP3rlN/b6mYhLPyeVks C9/VQ4uK+AHPMBwPVG45wYf7bEJcMElVSSNLnjQnOvTg/X/veUuRln02IpASPJ7CQN4HDk qUskl95JQKD3fbSV41e/+F+ea2FHF8cO283wY2WT1+Ey3UaL88pyM5k6AYFbfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYS1rCKzRkP; Wed, 24 Jan 2024 19:44:44 +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 40OJii24005466; Wed, 24 Jan 2024 19:44:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiiDZ005463; Wed, 24 Jan 2024 19:44:44 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:44 GMT Message-Id: <202401241944.40OJiiDZ005463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 57da891ad354 - stable/14 - share/man/man7/simd.7: document simd-enhanced strncpy, stpncpy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57da891ad354455a057eaec3d7860f2c462c3e16 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=57da891ad354455a057eaec3d7860f2c462c3e16 commit 57da891ad354455a057eaec3d7860f2c462c3e16 Author: Robert Clausecker AuthorDate: 2023-11-09 04:39:11 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:27 +0000 share/man/man7/simd.7: document simd-enhanced strncpy, stpncpy Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42519 (cherry picked from commit 75a9e2250656ff78ec1b0a124f282b925138ff51) --- share/man/man7/simd.7 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 4437d025394f..f3818c530af5 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd October 23, 2023 +.Dd November 8, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -65,6 +65,7 @@ Enhanced functions are present in the following architectures: .It memset Ta Ta S Ta S Ta S .It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta Ta Ta S1 +.It stpncpy Ta Ta Ta S1 .It strcat Ta Ta Ta S Ta S .It strchr Ta S Ta Ta S1 Ta S .It strchrnul Ta Ta Ta S1 @@ -73,7 +74,7 @@ Enhanced functions are present in the following architectures: .It strcspn Ta Ta Ta S2 .It strlen Ta Ta S Ta S1 .It strncmp Ta Ta S Ta S1 Ta S -.It strncpy Ta Ta Ta Ta Ta S2 +.It strncpy Ta Ta Ta S1 Ta Ta S2 .It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 @@ -209,7 +210,7 @@ SIMD-enhanced functions were first added with for .Cm powerpc64 and with -.Fx 14.0 +.Fx 14.1 for .Cm amd64 . .Pp From nobody Wed Jan 24 19:44:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYV6Clmz58c25; Wed, 24 Jan 2024 19:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYV4vwhz45r0; Wed, 24 Jan 2024 19:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=23ItC8K4WM+86cfnwIHUvEIjoPfDzecFKQZFUm9NdUc=; b=YVXmfTEO5eL4jJtwk19m7OLUKQgCmL426f5A/yp3cRrZd6T67/MsZKkftXuSQQzIB1ylaw g0JXZ0jdW1qPUue7MfZba1ct5/i3z/6PBaJPnsbB7iab1x+OkxitKYNDwuaSFj/Jd2IV63 SXkN070kMr4bwoEfeX8Bvl0jZ8S8X/hSjFe/K+Mr92P6WT3JKHfyMmm/EOBxyAsiSN474D vPw9Kz+6mzKKbt4kEhC0+77p+qVN7dpt0dSkmVyo3QJS84uqeNQS6M7E+NAGTI/uUawu3S Wpy38FuI4Rbse7xxxiLFtHP/7Ia4pDl2P/3W6Gg1tnPq3ejh+M7eH+t3PVBc8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=23ItC8K4WM+86cfnwIHUvEIjoPfDzecFKQZFUm9NdUc=; b=dHxP75TaPbYaIyR8jyNykfe1NNkRIs+VYzTxwjk9qTtIijg12Ywe9G7k5Eo8zUX2uVuNQd Mz6o/4vc+0xN177VZLPayldpt1fHgNB1xX/k5KOmjc9P/zn990ddp4qBA5xhCtAGKiP1Ql 0eZCY7MIByjlvxg6yaRoh1PyZSPEySZ04tTsB+G2gXX7abbVhQrPFU5aiRkLkbkdKmlZkr YAnHOrbgmDicu9/lKALV80GLw0DLjRlweBOqHIL3wueGb3+hsgebAtd6wqWLFcX47SyE6k Rn4YF9ARsVTJQvd8B0p6IjBenbyOH2GVe/h5+SCdkfmXsSjuCj/cWOhcKw4zyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125486; a=rsa-sha256; cv=none; b=gBStXSyQ16ewZXWnKfHWEm6yk3EBq6idJd0PxTiaxaCyRfq87v+LnAB5CR0QZJByK2Tyqd LLYY0DgCR7yRZ+IDRUq1eNzxhb8GNej4oU9f6EGo7kzQIMu4dvCmdPsFcc6fOmU4yKv4Gy AzO4OnYlEWoaMR83oBdyQ7PxxZLoMnbQztwWpFf/Y4ib3+gSIVBjFABvcxxtoPJswR8zkH qMX2GcjlOH5uaTjlaaIGNdNaH8j8vdyi9OUC/r0xb2QTjFSWh30+niGiM7GCxHoAaJYTVT 1P5dVAr3vIKra1UCWlDk4ovbPMSAKdMcxBrqJsFEEiJk22Wkkg0nxZTpsEqEnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYV40wXzRkQ; Wed, 24 Jan 2024 19:44:46 +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 40OJikTY005554; Wed, 24 Jan 2024 19:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJik0M005551; Wed, 24 Jan 2024 19:44:46 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:46 GMT Message-Id: <202401241944.40OJik0M005551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 1f733be3cca4 - stable/14 - share/man/man7/simd.7: document SIMD-enhanced strcat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f733be3cca4cac04ade21beb6aab04d66633d1e Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=1f733be3cca4cac04ade21beb6aab04d66633d1e commit 1f733be3cca4cac04ade21beb6aab04d66633d1e Author: Robert Clausecker AuthorDate: 2023-11-14 18:26:21 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:28 +0000 share/man/man7/simd.7: document SIMD-enhanced strcat Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42600 (cherry picked from commit c983825a77f276ab71a34baee0250d55a84f59fd) --- share/man/man7/simd.7 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index f3818c530af5..6ddf769b6d38 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd November 8, 2023 +.Dd November 14, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -48,7 +48,7 @@ the environment variable .Ev ARCHLEVEL can be used to override this mechanism. .Pp -Enhanced functions are present in the following architectures: +Enhanced functions are present for the following architectures: .Bl -column FUNCTION_________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent .It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 .It bcmp Ta Ta Ta S1 Ta S @@ -66,7 +66,7 @@ Enhanced functions are present in the following architectures: .It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta Ta Ta S1 .It stpncpy Ta Ta Ta S1 -.It strcat Ta Ta Ta S Ta S +.It strcat Ta Ta Ta S1 Ta S .It strchr Ta S Ta Ta S1 Ta S .It strchrnul Ta Ta Ta S1 .It strcmp Ta Ta S Ta S1 Ta S @@ -217,7 +217,7 @@ for A .Nm manual page appeared in -.Fx 14.0 . +.Fx 14.1 . . .Sh AUTHOR .An Robert Clausecker Aq Mt fuz@FreeBSD.org From nobody Wed Jan 24 19:44:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYT4XcZz58byN; Wed, 24 Jan 2024 19:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYT3lymz45vx; Wed, 24 Jan 2024 19:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urA6C0nK8QWTGpAkMueLyumKoRFp00uR73vU36lsDgI=; b=wx+b8sRfgtHiUo4eQl9G8l+z+lYCSShQTop692MzwskDIjIpcJb6fwSWKBEdjxwO+4eY1n FuwJS3tSfy0JUrXKr5nqQxWnSn7V4rqjxjcAruG+OWZ9iHVFyfvKgs0/0AboWPDsp/UG54 qH91Y/kLbQswUgC7qFTVZf4V70lNGgjv+/+Vr/Vrud5CCutupR+72JEEyLQXUrgmlZpstU tYpjK/4f1JaOMbWu2g8uR7/tCr0XYkcy+hkSOKlJB9t8YJDDO3lMJx68i0Kk0XUOxqyP9+ hytaXXv/DwBC01QXrQkZhUngTL1+x/X+ILgjYwE7/zUEKuCm47H6YggquNAtzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urA6C0nK8QWTGpAkMueLyumKoRFp00uR73vU36lsDgI=; b=dRDC0IfjiOTxQ+SqcoeV0uIy2V2/OkXyJOrhhcmUSNB15iMlf/ypOViQa07wXqZkAuzKOP C8IbpgDh80K8fbMrzWx/hZeXzBvAYNrv/cgItndokoBecJQICG1Fdf8Y8agTxY5U51jgfq pLAZNLPoB4jNKTJN5ldHe9MtGwN8sWT7Tz3QaqFaWxX3oobPScLIYh1Qk3+k/ge3dOriWs 9KZxCnZEpoQVigyhpEAH9Z4P0mej8r1af7QtebhkEFZe0m8bwnhOxDpwihRCEzd0ABtT7p 7Bn9HpX+DiYX6EmcIICAX15RONEGhezA62RbNmK7nEkK7bMrOU0SkogeQQCvzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125485; a=rsa-sha256; cv=none; b=jXhq2/464V7Y/fypIBjf+kI9DPt27wCxriAOvEZzDC2xHyHQWBwBcJ+/qTBBQqF7CPmIqK lgS9pCWGFa18OjVmjnsbVo1l3ZT0ZrecM/r/OZEVKrm/bphYJOlsxLbVTDAHliaVW18N/o G3KYuy4JKEo4B7eL0f7rLNXvt9Vicj3Nqru//9JeETDhjWbc3jkDfaqIY9Kk5KfFTd4xrD VRNgHShOfdYCYq7hXsniEsGEGHgNNC1bstuwft7SZgEJZD68IyLpMl+LxOZJEa0Fy+It7e VU4If5xVyd/yWTzDpodPvcJa3aVWuXuxFIq3I4aevnU7fmvnLlZSU1P0DDgI0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYT2tLlzRmv; Wed, 24 Jan 2024 19:44:45 +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 40OJijdK005508; Wed, 24 Jan 2024 19:44:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJijUO005506; Wed, 24 Jan 2024 19:44:45 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:45 GMT Message-Id: <202401241944.40OJijUO005506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 7a605ba8f799 - stable/14 - lib/libc/amd64/string/strcat.S: enable use of SIMD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a605ba8f7996f38ba7b353a0120d84bae48da0f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=7a605ba8f7996f38ba7b353a0120d84bae48da0f commit 7a605ba8f7996f38ba7b353a0120d84bae48da0f Author: Robert Clausecker AuthorDate: 2023-11-14 18:09:08 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:28 +0000 lib/libc/amd64/string/strcat.S: enable use of SIMD strcat has a bespoke scalar assembly implementation we inherited from NetBSD. While it performs well, it is better to call into our SIMD implementations if any SIMD features are available at all. So do that and implement strcat() by calling into strlen() and strcpy() if these are available. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Reviison: https://reviews.freebsd.org/D42600 (cherry picked from commit aff9143a242c0012b0195b3666e03fa3b7cd33e8) --- lib/libc/amd64/string/strcat.S | 47 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/lib/libc/amd64/string/strcat.S b/lib/libc/amd64/string/strcat.S index 0834408acfb7..081e98840cee 100644 --- a/lib/libc/amd64/string/strcat.S +++ b/lib/libc/amd64/string/strcat.S @@ -1,6 +1,14 @@ -/* - * Written by J.T. Conklin - * Public domain. +/*- + * Copyright (c) 2023, The FreeBSD Foundation + * + * SPDX-License-Expression: BSD-2-Clause + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Adapted from NetBSD's common/lib/libc/arch/x86_64/string/strcat.S + * written by J.T. Conklin + * that was originally dedicated to the public domain */ #include @@ -8,7 +16,14 @@ RCSID("$NetBSD: strcat.S,v 1.4 2004/07/26 18:51:21 drochner Exp $") #endif -ENTRY(strcat) +#include "amd64_archlevel.h" + +ARCHFUNCS(strcat) + ARCHFUNC(strcat, scalar) + ARCHFUNC(strcat, baseline) +ENDARCHFUNCS(strcat) + +ARCHENTRY(strcat, scalar) movq %rdi,%rax movabsq $0x0101010101010101,%r8 movabsq $0x8080808080808080,%r9 @@ -161,6 +176,28 @@ ENTRY(strcat) .Ldone: ret -END(strcat) +ARCHEND(strcat, scalar) + +/* + * Call into strlen + strcpy if we have any SIMD at all. + * The scalar implementation above is better for the scalar + * case as it avoids the function call overhead, but pessimal + * if we could call SIMD routines instead. + */ +ARCHENTRY(strcat, baseline) + push %rbp + mov %rsp, %rbp + push %rsi + push %rbx + mov %rdi, %rbx # remember destination for later + call CNAME(strlen) # strlen(dest) + mov -8(%rbp), %rsi + lea (%rbx, %rax, 1), %rdi # dest + strlen(dest) + call CNAME(__stpcpy) # stpcpy(dest + strlen(dest), src) + mov %rbx, %rax # return dest + pop %rbx + leave + ret +ARCHEND(strcat, baseline) .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYX0hHYz58byT; Wed, 24 Jan 2024 19:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYW5vcwz4621; Wed, 24 Jan 2024 19:44:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+X6o871toTbokqNW2picFZv8G+NruOk6daUUMF9WPY=; b=Zd6SuFrEmKEI8zfiJmCp21CJEeM1G+ZJYX422UkdTCs4otUJJuVh3A4VzwIpFvDi8Ywifx bYyWLvHyC5s85Day+DsUrXQ8i2IuICj99xleLioRkRaMQAaJhqY/LCecAY91+BOe6+qj8K Q6Sx5IPxVt5yAd5MWWJ+UK2WDs2GdVRok8AvYLPF2K87B185TP6JB9QQ9Bxe7v4FnUnaNY CVsvcjyh+O9eAHl6PQb6rrgdXegatkoKoDwRBmGATt8gccL5QuC/Pqtfjen3z8SxfrC+mb bbNuiEAZdRbaG7AeQ+3WwQF8q3lidlHmEz7ai3vPzJ26RxgMmBguVrBHECag3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+X6o871toTbokqNW2picFZv8G+NruOk6daUUMF9WPY=; b=o+rUwJBiGtZZaDD0QzTlHTNwQkBd5bX1FD07r0K3VwoshrP+tVboSMJk//mfCYgSGLm+fG /o5uod2MuvkkJq3mKsc8Bnhy2fcL5kQciuxvF1Swjh8RriRKsjXtdTLRs2KO0N675BCGvj ni8h6dUusl7FgI46qU6os3Nf3tHImnoKOLMOOfB2k/LVvnstSg17NIVCU75ro0JkGnNLKg BXsfBbnrFahXL9iYq9x6uQeMTfY5Pi1S1C7053KwL6+HZEKrwebARhTBWz7HGTr2zytPTG d500Rxg24lKaWiMPMbwjGxBxiAu6YYYW/N7ASZvHiseoZrtRwxLLKewldnhljg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125487; a=rsa-sha256; cv=none; b=WenelLs9mqkq8suBmSQv6MyGoZ3az46MOzoXnVxuyKQDAwzUmNrptBcnBKWQYiF3nLmRmf LxJnC6mEVrDEDsGFqRumm/4wUcbRtUdSf4zdSt+TSUsMcQHrr/LZv1oBSzL7acckcWeA0u Y7+MlX/er8NjLqWy25BWLaoe2qgsz7v0ZKsb8Wj5QzbKomEAcFD/sq2TI04jHIl8EMvoHK Owl0Nz/Xgu2rcV1L/V0E6uD4/FxGyltLW5JnIFEQWvwmcjOHgG2xECc6d3gzFWaPP646eS oNUTTdVjDJDR1d6VZGTVxzXrziijIGUo9erbgjZyiAHCndCBc0mvh5hSzSGylw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYW50ydzS8w; Wed, 24 Jan 2024 19:44:47 +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 40OJilTF005605; Wed, 24 Jan 2024 19:44:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJilnI005602; Wed, 24 Jan 2024 19:44:47 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:47 GMT Message-Id: <202401241944.40OJilnI005602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: f5d63ae20d65 - stable/14 - lib/libc/tests/string: add unit test for strlcpy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5d63ae20d653e12d3617704e6317e3c8c50b640 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f5d63ae20d653e12d3617704e6317e3c8c50b640 commit f5d63ae20d653e12d3617704e6317e3c8c50b640 Author: Robert Clausecker AuthorDate: 2023-11-09 18:08:23 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:28 +0000 lib/libc/tests/string: add unit test for strlcpy A straightforward derivation from the stpncpy unit test. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 (cherry picked from commit f7098b8659923873a7c60b64cb68182e470786f9) --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/strlcpy_test.c | 183 +++++++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index 5874f7b6b873..81e59ee65155 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -16,6 +16,7 @@ ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strcmp2_test ATF_TESTS_C+= strcspn_test ATF_TESTS_C+= strerror2_test +ATF_TESTS_C+= strlcpy_test ATF_TESTS_C+= strspn_test ATF_TESTS_C+= strverscmp_test ATF_TESTS_C+= strxfrm_test diff --git a/lib/libc/tests/string/strlcpy_test.c b/lib/libc/tests/string/strlcpy_test.c new file mode 100644 index 000000000000..646bef42683e --- /dev/null +++ b/lib/libc/tests/string/strlcpy_test.c @@ -0,0 +1,183 @@ +/*- + * Copyright (c) 2009 David Schultz + * Copyright (c) 2023 The FreeBSD Foundation + * All rights reserved. + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +size_t (*strlcpy_fn)(char *restrict, const char *restrict, size_t); + +static char * +makebuf(size_t len, int guard_at_end) +{ + char *buf; + size_t alloc_size, page_size; + + page_size = getpagesize(); + alloc_size = roundup2(len, page_size) + page_size; + + buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); + assert(buf); + if (guard_at_end) { + assert(munmap(buf + alloc_size - page_size, page_size) == 0); + return (buf + alloc_size - page_size - len); + } else { + assert(munmap(buf, page_size) == 0); + return (buf + page_size); + } +} + +static void +test_strlcpy(const char *s) +{ + char *src, *dst; + size_t size, bufsize, x; + int i, j; + + size = strlen(s) + 1; + for (i = 0; i <= 1; i++) { + for (j = 0; j <= 1; j++) { + for (bufsize = 0; bufsize <= size + 10; bufsize++) { + src = makebuf(size, i); + memcpy(src, s, size); + dst = makebuf(bufsize, j); + memset(dst, 'X', bufsize); + assert(strlcpy_fn(dst, src, bufsize) == size-1); + assert(bufsize == 0 || strncmp(src, dst, bufsize - 1) == 0); + for (x = size; x < bufsize; x++) + assert(dst[x] == 'X'); + } + } + } +} + +static void +test_sentinel(char *dest, char *src, size_t destlen, size_t srclen) +{ + size_t i; + size_t res, wantres; + const char *fail = NULL; + + for (i = 0; i < srclen; i++) + /* src will never include (){} */ + src[i] = '0' + i; + src[srclen] = '\0'; + + /* source sentinels: not to be copied */ + src[-1] = '('; + src[srclen+1] = ')'; + + memset(dest, '\xee', destlen); + + /* destination sentinels: not to be touched */ + dest[-1] = '{'; + dest[destlen] = '}'; + + wantres = srclen; + res = strlcpy_fn(dest, src, destlen); + + if (dest[-1] != '{') + fail = "start sentinel overwritten"; + else if (dest[destlen] != '}') + fail = "end sentinel overwritten"; + else if (res != wantres) + fail = "incorrect return value"; + else if (destlen > 0 && strncmp(src, dest, destlen - 1) != 0) + fail = "string not copied correctly"; + else if (destlen > 0 && srclen >= destlen - 1 && dest[destlen-1] != '\0') + fail = "string not NUL terminated"; + else for (i = srclen + 1; i < destlen; i++) + if (dest[i] != '\xee') { + fail = "buffer mutilated behind string"; + break; + } + + if (fail) + atf_tc_fail_nonfatal("%s\n" + "strlcpy(%p \"%s\", %p \"%s\", %zu) = %zu (want %zu)\n", + fail, dest, dest, src, src, destlen, res, wantres); +} + +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) +{ + ATF_CHECK_EQ(strlcpy_fn(NULL, "foo", 0), 3); +} + +ATF_TC_WITHOUT_HEAD(bounds); +ATF_TC_BODY(bounds, tc) +{ + size_t i; + char buf[64+1]; + + for (i = 0; i < sizeof(buf) - 1; i++) { + buf[i] = ' ' + i; + buf[i+1] = '\0'; + test_strlcpy(buf); + } +} + +ATF_TC_WITHOUT_HEAD(alignments); +ATF_TC_BODY(alignments, tc) +{ + size_t srcalign, destalign, srclen, destlen; + char src[15+3+64]; /* 15 offsets + 64 max length + NUL + sentinels */ + char dest[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + + for (srcalign = 0; srcalign < 16; srcalign++) + for (destalign = 0; destalign < 16; destalign++) + for (srclen = 0; srclen < 64; srclen++) + for (destlen = 0; destlen < 64; destlen++) + test_sentinel(dest+destalign+1, + src+srcalign+1, destlen, srclen); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + strlcpy_fn = dlsym(dl_handle, "test_strlcpy"); + if (strlcpy_fn == NULL) + strlcpy_fn = strlcpy; + + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, bounds); + ATF_TP_ADD_TC(tp, alignments); + + return (atf_no_error()); +} From nobody Wed Jan 24 19:44:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYY1ldWz58bdj; Wed, 24 Jan 2024 19:44: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 4TKvYX6m2yz45p2; Wed, 24 Jan 2024 19:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZdAIPnCPmAPlpe6KI8g+sCn+TYTYqUdqZym8Piib7I=; b=EJD3ranU9CcitNysgjFAuyFiYtnTHy9fnO85/so6DTU0gXg2JGUym1Schev79O6+eXzZFg qsvBaokn9zrC9uz0v5ldgDuVetcuQTEPeBxNvFjVGOTFlxEWKb3i0ksHbjKPKRAGTX5sy2 uyRr8Nz+4giKJ9+0GgZ8acWNjZIoU5AMCWJoDJzv7Q75PhE8X5ATLEyfwPBkPe8lFh6yVt zzGu/Z1JnzjymfmozFJt8zTTwzmM1TTi/6AjfazRmj4mEA1m8NRr45AXWFPkG6kruk93fC pHtjohs8aJO7um0cOQyRoHH9/nxlYi8cw2TQZHn/DDfMHX0csnk+qFj5ENaBNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZdAIPnCPmAPlpe6KI8g+sCn+TYTYqUdqZym8Piib7I=; b=W3cH52CO/JHfEA9H/cB2TbwPHG7+WdTkdgzJmOAJat8vGJIWW0jzrJGmNxEgBvYpQm/+XL kDuE1Lka7HWkjhjnZY2VwbphkbpA5In4KkzkfeJNdVhYjH8Vg/obEzKCUVrq+dGwNnNBlv P6O5+tc/gL3LHqqvFWuQUygzb5ILDdJUmIo0c1/mFM5bzQUwcDr96/usiEafc0qj9k1uj5 XdxNLc5k2kKd96Bse8Xsmb75AYPXYSApNXyOTmCdBOr2xh83Fgq7KN1KX0EvHScbNU/xha OgxGAY5ogOidlJZZpeYmE7tRRoiwPUpBUG+P4/485WVYLjijz4DYjFyfjID4UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125488; a=rsa-sha256; cv=none; b=eiKkAbtDsi9y0n6NPtsZg1kwwNtPRSMZIG2ETV/Oll0KGYvyl1VWffKXmsYBUb6YryA4fP Z1HFbE7Q0t/ny1mzxIbI0JoZXI+Qq5Vn2P0HlJ9XnisgaVeK4GPeFr2wamm1JjFkCay62U cZ+edJfmAmcbp1kJGleLtG3Lx5bwxlzzBUlZNc0BMm056wzkYWajoMlkOfX7P3hPBsxr40 p1Snv62ouV25gvVTusu2662od693hUfGnfZLoZjLx/z6SkYDyQdxnlh5bXKlaHl385okYI B3h/cOumIGDjoT4GbezxcjUoaajFEabhus3BQKkrxUKvo3SAeN8D1fuEGXj+Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYX5tDYzRgp; Wed, 24 Jan 2024 19:44:48 +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 40OJimaw005650; Wed, 24 Jan 2024 19:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJimW7005647; Wed, 24 Jan 2024 19:44:48 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:48 GMT Message-Id: <202401241944.40OJimW7005647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 903cb811ffe2 - stable/14 - lib/libc/amd64/string: add strlcpy scalar, baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 903cb811ffe2f3e68beccd8fef5208cf0e224770 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=903cb811ffe2f3e68beccd8fef5208cf0e224770 commit 903cb811ffe2f3e68beccd8fef5208cf0e224770 Author: Robert Clausecker AuthorDate: 2023-11-12 22:47:06 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:28 +0000 lib/libc/amd64/string: add strlcpy scalar, baseline implementation Somewhat similar to stpncpy, but different in that we need to compute the full source length even if the buffer is shorter than the source. strlcat is implemented as a simple wrapper around strlcpy. The scalar implementation of strlcpy just calls into strlen() and memcpy() to do the job. Perf-wise we're very close to stpncpy. The code is slightly slower as it needs to carry on with finding the source string length even if the buffer ends before the string. Sponsored by: The FreeBSD Foundation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 (cherry picked from commit 74d6cfad54d676299ee5e4695139461876dfd757) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strlcpy.S | 281 +++++++++++++++++++++++++++++++++++++ 2 files changed, 282 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index d982061e080b..03bca498e116 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcmp.S \ strcpy.c \ strcspn.S \ + strlcpy.S \ strlen.S \ strncmp.S \ strncpy.c \ diff --git a/lib/libc/amd64/string/strlcpy.S b/lib/libc/amd64/string/strlcpy.S new file mode 100644 index 000000000000..2b32c6c78047 --- /dev/null +++ b/lib/libc/amd64/string/strlcpy.S @@ -0,0 +1,281 @@ +/* + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + + .weak strlcpy + .set strlcpy, __strlcpy +ARCHFUNCS(__strlcpy) + ARCHFUNC(__strlcpy, scalar) + ARCHFUNC(__strlcpy, baseline) +ENDARCHFUNCS(__strlcpy) + +ARCHENTRY(__strlcpy, scalar) + push %rbp # establish stack frame + mov %rsp, %rbp + push %rsi + push %rbx + push %rdi + push %rdx + mov %rsi, %rdi + call CNAME(strlen) # strlen(src) + pop %rdx + pop %rdi + mov -8(%rbp), %rsi + mov %rax, %rbx # remember string length for return value + sub $1, %rdx # do not copy into the final byte of the buffer + jc 0f # skip copying altogether if buffer was empty + cmp %rax, %rdx # is the buffer longer than the input? + cmova %rax, %rdx # if yes, only copy the part that fits + movb $0, (%rdi, %rdx, 1) # NUL-terminate output buffer + call CNAME(memcpy) # copy string to output +0: mov %rbx, %rax # restore return value + pop %rbx + leave + ret +ARCHEND(__strlcpy, scalar) + +ARCHENTRY(__strlcpy, baseline) + sub $1, %rdx # do not count NUL byte in buffer length + jb .L0 # go to special code path if len was 0 + + mov %esi, %ecx + pxor %xmm1, %xmm1 + mov %rsi, %r9 # stash a copy of the source pointer for later + and $~0xf, %rsi + pcmpeqb (%rsi), %xmm1 # NUL found in head? + mov $-1, %r8d + and $0xf, %ecx + shl %cl, %r8d # mask of bytes in the string + pmovmskb %xmm1, %eax + and %r8d, %eax + jnz .Lhead_nul + + movdqa 16(%rsi), %xmm3 # load second string chunk + movdqu (%r9), %xmm2 # load unaligned string head + mov $32, %r8d + sub %ecx, %r8d # head length + length of second chunk + pxor %xmm1, %xmm1 + pcmpeqb %xmm3, %xmm1 # NUL found in second chunk? + + sub %r8, %rdx # enough space left for the second chunk? + jbe .Lhead_buf_end + + /* process second chunk */ + pmovmskb %xmm1, %eax + test %eax, %eax + jnz .Lsecond_nul + + /* string didn't end in second chunk and neither did buffer -- not a runt! */ + movdqa 32(%rsi), %xmm0 # load next string chunk + pxor %xmm1, %xmm1 + movdqu %xmm2, (%rdi) # deposit head into buffer + sub %rcx, %rdi # adjust RDI to correspond to RSI + movdqu %xmm3, 16(%rdi) # deposit second chunk + sub %rsi, %rdi # express RDI as distance from RSI + add $32, %rsi # advance RSI past first two chunks + sub $16, %rdx # enough left for another round? + jbe 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 3f + + movdqu %xmm0, (%rsi, %rdi) + movdqa 16(%rsi), %xmm0 # load next string chunk + pxor %xmm1, %xmm1 + cmp $16, %rdx # more than a full chunk left? + jbe 2f + + add $32, %rsi # advance pointers to next chunk + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 4f + + movdqu %xmm0, -16(%rsi, %rdi) + movdqa (%rsi), %xmm0 # load next string chunk + pxor %xmm1, %xmm1 + sub $32, %rdx + ja 0b + +1: sub $16, %rsi # undo second advancement + add $16, %edx + + /* 1--16 bytes left in the buffer but string has not ended yet */ +2: pcmpeqb %xmm1, %xmm0 # NUL byte encountered? + pmovmskb %xmm0, %r8d + mov %r8d, %eax + bts %edx, %r8d # treat end of buffer as end of string + tzcnt %r8d, %r8d # find tail length + add %rsi, %rdi # restore RDI + movdqu (%rsi, %r8, 1), %xmm0 # load string tail + movdqu %xmm0, (%rdi, %r8, 1) # store string tail + movb $0, 16(%rdi, %r8, 1) # NUL terminate + + /* continue to find the end of the string */ + test %eax, %eax # end of string already reached? + jnz 1f + + ALIGN_TEXT +0: pcmpeqb 32(%rsi), %xmm1 + pmovmskb %xmm1, %eax + pxor %xmm1, %xmm1 + test %eax, %eax + jnz 2f + + pcmpeqb 48(%rsi), %xmm1 + pmovmskb %xmm1, %eax + add $32, %rsi + pxor %xmm1, %xmm1 + test %eax, %eax + jz 0b + +1: sub $16, %rsi # undo second advancement +2: tzcnt %eax, %eax # where is the NUL byte? + sub %r9, %rsi + lea 32(%rsi, %rax, 1), %rax # return string length + ret + +4: sub $16, %rsi # undo second advancement + add $16, %rdx # restore number of remaining bytes + + /* string has ended but buffer has not */ +3: tzcnt %eax, %eax # find length of string tail + movdqu -15(%rsi, %rax, 1), %xmm0 # load string tail (incl. NUL) + add %rsi, %rdi # restore destination pointer + movdqu %xmm0, -15(%rdi, %rax, 1) # store string tail (incl. NUL) + sub %r9, %rsi # string length to current chunk + add %rsi, %rax # plus length of current chunk + ret + +.Lhead_buf_end: + pmovmskb %xmm1, %r8d + add $32, %edx # restore edx to (len-1) + ecx + mov %r8d, %eax + shl $16, %r8d # place 2nd chunk NUL mask into bits 16--31 + bts %rdx, %r8 # treat end of buffer as end of string + tzcnt %r8, %rdx # find string/bufer len from alignment boundary + sub %ecx, %edx # find actual string/buffer len + movb $0, (%rdi, %rdx, 1) # write NUL terminator + + /* continue to find the end of the string */ + test %eax, %eax # end of string already reached? + jnz 1f + + ALIGN_TEXT +0: pcmpeqb 32(%rsi), %xmm1 + pmovmskb %xmm1, %eax + pxor %xmm1, %xmm1 + test %eax, %eax + jnz 2f + + pcmpeqb 48(%rsi), %xmm1 + pmovmskb %xmm1, %eax + add $32, %rsi + pxor %xmm1, %xmm1 + test %eax, %eax + jz 0b + +1: sub $16, %rsi +2: tzcnt %eax, %eax + sub %r9, %rsi + lea 32(%rsi, %rax, 1), %rax # return string length + jmp .L0031 + +.Lsecond_nul: + add %r8, %rdx # restore buffer length + tzcnt %eax, %eax # where is the NUL byte? + lea -16(%rcx), %r8d + sub %r8d, %eax # string length + cmp %rax, %rdx # is the string shorter than the buffer? + cmova %rax, %rdx # copy only min(buflen, srclen) bytes + movb $0, (%rdi, %rdx, 1) # write NUL terminator +.L0031: cmp $16, %rdx # at least 16 bytes to copy (not incl NUL)? + jb .L0015 + + /* copy 16--31 bytes */ + movdqu (%r9), %xmm0 # load first 16 bytes + movdqu -16(%r9, %rdx, 1), %xmm1 # load last 16 bytes + movdqu %xmm0, (%rdi) + movdqu %xmm1, -16(%rdi, %rdx, 1) + ret + +.Lhead_nul: + tzcnt %eax, %eax # where is the NUL byte? + sub %ecx, %eax # ... from the beginning of the string? + cmp %rax, %rdx # is the string shorter than the buffer? + cmova %rax, %rdx # copy only min(buflen, srclen) bytes + movb $0, (%rdi, %rdx, 1) # write NUL terminator + + /* process strings of 0--15 bytes (rdx: min(buflen, srclen), rax: srclen) */ +.L0015: cmp $8, %rdx # at least 8 bytes to copy? + jae .L0815 + + cmp $4, %rdx # at least 4 bytes to copy? + jae .L0407 + + cmp $2, %rdx # at least 2 bytes to copy? + jae .L0203 + + movzbl (%r9), %ecx # load first byte from src + mov %cl, (%rdi) # deposit into destination + movb $0, (%rdi, %rdx, 1) # add NUL terminator (again) + ret + +.L0203: movzwl (%r9), %ecx + movzwl -2(%r9, %rdx, 1), %esi + mov %cx, (%rdi) + mov %si, -2(%rdi, %rdx, 1) + ret + +.L0407: mov (%r9), %ecx + mov -4(%r9, %rdx, 1), %esi + mov %ecx, (%rdi) + mov %esi, -4(%rdi, %rdx, 1) + ret + +.L0815: mov (%r9), %rcx + mov -8(%r9, %rdx, 1), %rsi + mov %rcx, (%rdi) + mov %rsi, -8(%rdi, %rdx, 1) + ret + + /* length zero destination: just return the string length */ +.L0: mov %rsi, %rdi + jmp CNAME(strlen) +ARCHEND(__strlcpy, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYZ41gzz58bdl; Wed, 24 Jan 2024 19:44: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 4TKvYZ0f0cz464d; Wed, 24 Jan 2024 19:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jGFXvv9pE8zCZLoiFvAa3sJ2Y27DKSB/zryselIQn4=; b=qSk9iw1D1nystFw/We2iccgofBx4NEen42RKHNMOW79Q7RSPj0zrwSqqfsoK0QYgVKa67Z xq6gSWdyFovAAzDujR93SKIKYopSnlB5E6dnFchM1DC8mLxtJ9djqRZBIoR7PZ8B0qTWJ3 TL2dZFdvRbi9HM++DPNuaZ4GBw5K2vdlBO5LMRzIs2LY+rCG7OA5j+0RPrtIXsioMhmPtP kZ19A5vdLojvz+2nCBVbLYjZViRhNx8K7bollCpmvXMANeH9JcXmxNMSWZcspbubdmq8oH RuctGtlXNNjBv3Os0EJhYiZMxIFFPr2bAmDN4AgKzUSKuKBgyUwGvwxfzBoyRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jGFXvv9pE8zCZLoiFvAa3sJ2Y27DKSB/zryselIQn4=; b=OxL80C7efobQcJuvn2Aig9K28Cbk7uSFeMG0JONB6YPxdso2dgNDFTscUyl4Fh3iKmq5mV wtImOmoJktSSlHrLOf4na3IU7oq3PMW2ODaV3rQU1FObAIkyQnXrwS0RtVYIpH9LrBFMpE /Be59178mM3bnCkcJ7XIXtlbbFLG9VLeB9Qezdh/42myO5RjFjQV5dLjix7JQjYD1MRJl4 /sivioNo0cInGbM+RNd3XdV1txZfABgE26pLNz3+6gH5m9HnXplKXSDWveTR72FoF71FyV Vc1WE3O0nT+CNrfyYu+ZmsYtc/nKaZ8/qGRXBdNNnrJ3981CLBplwfznnvngQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125490; a=rsa-sha256; cv=none; b=r4TCjRWCmn7pgnWS9o9lYB746tbvH0Fr398u6vUd61a2rPxMOfwRLBUmWXg3ezfdp909Km rA+Zeqie73ht8GOnVxr6/qZF8PRIIeLy8JYA3TFP95qUdey4ueh2VGFRxZi5f6UOkD41sk kYgnfBDcX3hKS5NYZvVB6WHiQVW9n6Xmyu+lj01wDQV2TPmgXKGfQP4yl/M/fQFpTpqhZO iQlD3hxovY1UUotjJ7wP6uZVzfFoQqE76K8lZdlJXD1wxYRp4+pZRDhcDwm3q3MhthUXsv rv7HPPHe+ZrMEN4YAYeePvDN7iXy+D89Z1QxinN0ZCn86OdeVhA/WTd0f1vtEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYY6rV9zRmw; Wed, 24 Jan 2024 19:44: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 40OJinsX005692; Wed, 24 Jan 2024 19:44:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJinZn005689; Wed, 24 Jan 2024 19:44:49 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:49 GMT Message-Id: <202401241944.40OJinZn005689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 3045c0f198a1 - stable/14 - lib/libc/amd64/string: implement strlcat() through strlcpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3045c0f198a1113a02f44f77b161fcf79380ae63 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3045c0f198a1113a02f44f77b161fcf79380ae63 commit 3045c0f198a1113a02f44f77b161fcf79380ae63 Author: Robert Clausecker AuthorDate: 2023-11-29 02:32:28 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:29 +0000 lib/libc/amd64/string: implement strlcat() through strlcpy() This should pick up our optimised memchr(), strlen(), and strlcpy() when strlcat() is called. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 (cherry picked from commit 2b7b03b7ae179db465c1ef19a5007f729874916a) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strlcat.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 03bca498e116..2b1e276cb3da 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -13,6 +13,7 @@ MDSRCS+= \ strcmp.S \ strcpy.c \ strcspn.S \ + strlcat.c \ strlcpy.S \ strlen.S \ strncmp.S \ diff --git a/lib/libc/amd64/string/strlcat.c b/lib/libc/amd64/string/strlcat.c new file mode 100644 index 000000000000..0c1e1c5d05f7 --- /dev/null +++ b/lib/libc/amd64/string/strlcat.c @@ -0,0 +1,25 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include + +void *__memchr(const void *, int, size_t); +size_t __strlcpy(char *restrict, const char *restrict, size_t); + +size_t +strlcat(char *restrict dst, const char *restrict src, size_t dstsize) +{ + char *loc = __memchr(dst, '\0', dstsize); + + if (loc != NULL) { + size_t dstlen = (size_t)(loc - dst); + + return (dstlen + __strlcpy(loc, src, dstsize - dstlen)); + } else + return (dstsize + strlen(src)); +} From nobody Wed Jan 24 19:44:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYb5FwMz58br9; Wed, 24 Jan 2024 19:44: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 4TKvYb1rt5z45v9; Wed, 24 Jan 2024 19:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZOR17PnrqA7N3evKr7Xj73QN2VJQlvBf261wpYIP3A=; b=QYD2fYg1RWZYTfEKKCJqZHk1SSE/FczLR0JsEfixSaeNDovMBHu9vrEqn81ClhRYSOUMlj II/3iW9txRtJLWp6CPq4Ls3yAHnYLB0mK6H3tK58ia3xhYUilY4teOYbVfcBDSUVzg09NO C/bvJcCxpC3uGnySXikBTsSaU6gD5kkrjwv8sANUKN/AlAxPrpwHT84ol6k4K5VlUSBgxQ geYzEf7zOdJLYVm9h3zUaQ9IpCSrW9FfxFG03ixLGPGHnqT1ogp2d3xJ12VPM1o1HjsCxz u2lnileiuFFkZpeE1gsPJgJz0zrr5L9UPSLSZ3OtEUjThqabwfLhPEWbyzNwpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZOR17PnrqA7N3evKr7Xj73QN2VJQlvBf261wpYIP3A=; b=PfKwcG2YpwMaHOIl2hu+K2rMv31w+OdK6sUdFqAkohVemstYiupWjQUtaadSQgVV1oVAx2 r/q3XU4WDQW+S19vD9tZA1mjFB0PberHy7CyvIvlEwe99iSgdpSc4d86MrLAK+gelAxVgu tuwVYnt/6m1lM+SuEW3IOJTsHkACiGSQnOSM/uV47lXti24xxkkxNbk+IuhnXTroE6UUn+ 9EgizbIbArFJMWHAcTVZr3uONISW1SZX7sy5B5KQ33eA/CNBLEJTprQ369wC8rOhMXFeLD qSfduTgiZzUxLNkSnrYvm+vTCHcKH7sloJ9P3d3/07xDE1NFs2PKUaG1sZT6BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125491; a=rsa-sha256; cv=none; b=yCFte0F1puGpbWxlN7u1oDMz94WhXeKKkLnzMTNUQxK0mC3N5HERjUKGtG3Lp1fXeFM3bA i7H3dPxAFLOR94BEM/3TqZjAuLV4OtXsgEuCgnBtCIpX3jWbhEQE9eS4xXEPoC7E0KNvC6 HPq+Nm6fYpKu0xsQWsgdLHIkpoRvpgtL8i13rqW26V4+RTzaVlja92n+9qLf7+olo+YJb0 SBGw0IidUCbmeqKq1O5AdWTe4vd7JpwkRu4e8+nXLG6k5x+YuUcCk2gbj/go8rBjxeBm/3 N2CganAvsHYVIX3e3HIQU0Cdw7XvcXotglw3xT83YbKdn0Xkl8z0IkitwsxcwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYb0yZhzRmx; Wed, 24 Jan 2024 19:44: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 40OJip72005734; Wed, 24 Jan 2024 19:44:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJipqJ005731; Wed, 24 Jan 2024 19:44:51 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:51 GMT Message-Id: <202401241944.40OJipqJ005731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 5a37572b5ba6 - stable/14 - share/man/man7/simd.7: document scalar/baseline strlcpy, strlcat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5a37572b5ba6001534514992b2d9ac22ab347678 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5a37572b5ba6001534514992b2d9ac22ab347678 commit 5a37572b5ba6001534514992b2d9ac22ab347678 Author: Robert Clausecker AuthorDate: 2023-11-29 02:35:45 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:29 +0000 share/man/man7/simd.7: document scalar/baseline strlcpy, strlcat Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42863 (cherry picked from commit d4a5605d9fedcff34227707133a8d6694ccbfc36) --- share/man/man7/simd.7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 6ddf769b6d38..e025d3ac9f12 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd November 14, 2023 +.Dd November 28, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -72,6 +72,8 @@ Enhanced functions are present for the following architectures: .It strcmp Ta Ta S Ta S1 Ta S .It strcpy Ta Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 +.It strlcat Ta Ta Ta S1 +.It strlcpy Ta Ta Ta S1 .It strlen Ta Ta S Ta S1 .It strncmp Ta Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 From nobody Wed Jan 24 19:44:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYf0DhHz58bdt; Wed, 24 Jan 2024 19:44: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 4TKvYd3q7rz469f; Wed, 24 Jan 2024 19:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQiSdRBLjqntMoliwauZmF6hEF4FT4Mns1Cc4M3fNOk=; b=V7OmpUvlxu36o2y8y0w2JsQ7uuG+0LdzLqQM89IKBICWJJL8E7jmg7LrsgHsdcCCmT9K6N P/r6KuoI1IAxAh0xWUn5/t4V6sHU9cxzZfwOtHNd6+VmUqiYxKwAMj3JqX9pV2VLv17LXP r4Nj++RwRq0ppZGgrNFFAu5kSnGKwincCJ2V0oPPdR0VjXcF9sQKPFGoMx6SmS8FTq6xYF M9Jiz7cpPKMOOZON8ZgH11Bmd9GhrQbPWnB3h5QXgi0siJESb4T1oprGO57/36f6Kk44iP JtnCgGLOM56vuPiCHUK+TCYTAFkmPlaWKb48W1SE0zXrm3rw8P1bLF4dpAgpdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQiSdRBLjqntMoliwauZmF6hEF4FT4Mns1Cc4M3fNOk=; b=AZZB1vaw/a7H9zVXb0bMBjS2GwWG6Sgv2+ys/Me/kneUTmjMRB3YkfFOtCYV86OT/g9rn6 JcbLNmZ8UE9vwCo8iCfUOjdlKLhIGXalEXkB5xDe0GpiG/hBQAw9vCOXvTuc1ArqDQFlOP Hu4cSSXwQ8mBj/W/Z5LCgViNwOXh3jwK8iXPoluzFvxOSVALzESlRsygzL1kf6ZiEAwnKI qLTzsJnx3ijqgigaEGrON1rfwGtxvMlUrjxZg5QrjxaAhmFCoVQ/7vMEBxL8C8YUV6NyKA +y03WMMDw1TaFWf6wee0+Cu81+0p8kt7H6DwxC0IdBm+tGnoWQzuP9F0SMEhCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125493; a=rsa-sha256; cv=none; b=gpNNZUmn8mlpEZU3nSSb9HUo1jYhOIUTqPOiB7nX2KcP6UJI8+oBGyKnpLaIJla0ku7zg4 WNHBM+BekE2yXcf+E8oVtUEE19QdxoDiSS8Nfytu/lfqsJISoyGcF7OMdCHtyMGxytuxV7 GlptqSiv+nlcnohgbxO+Hm9+dm0Tmb47vkP5v7aYaNPgVz52e9OtiwJl58PsTo3hlw9RiB Kxjtn2KROoHNkhnlWiNkiUA89zzvNKZuCU8A/4+efm5UJn2uzyJ0oRORpXmX0v+0/s4SVY sLDf9KRYWenitvFitmcTqxnyhnhKz+w05HnPnBMtAWK52dNpJLl7Tze360M7aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYd2wKzzRn0; Wed, 24 Jan 2024 19:44: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 40OJir67005831; Wed, 24 Jan 2024 19:44:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJirR9005828; Wed, 24 Jan 2024 19:44:53 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:53 GMT Message-Id: <202401241944.40OJirR9005828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: de2d155d2cac - stable/14 - lib/libc/tests/string: add unit tests for memccpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: de2d155d2cac49025958d927aaaef66d99bcb537 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=de2d155d2cac49025958d927aaaef66d99bcb537 commit de2d155d2cac49025958d927aaaef66d99bcb537 Author: Robert Clausecker AuthorDate: 2023-12-03 11:42:17 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:29 +0000 lib/libc/tests/string: add unit tests for memccpy() Adapted from the strlcpy() unit tests. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 (cherry picked from commit e4b7b0bcbc741f0998640c2ba55ec00ba613bb75) --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/memccpy_test.c | 205 +++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index 81e59ee65155..a6e8eb18075a 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -9,6 +9,7 @@ ATF_TESTS_C+= ffsll_test ATF_TESTS_C+= fls_test ATF_TESTS_C+= flsl_test ATF_TESTS_C+= flsll_test +ATF_TESTS_C+= memccpy_test ATF_TESTS_C+= memcmp_test ATF_TESTS_C+= memset_s_test ATF_TESTS_C+= strncmp_test diff --git a/lib/libc/tests/string/memccpy_test.c b/lib/libc/tests/string/memccpy_test.c new file mode 100644 index 000000000000..82f4ef34af54 --- /dev/null +++ b/lib/libc/tests/string/memccpy_test.c @@ -0,0 +1,205 @@ +/*- + * Copyright (c) 2009 David Schultz + * Copyright (c) 2023 The FreeBSD Foundation + * All rights reserved. + * + * Portions of this software were developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +void *(*memccpy_fn)(void *restrict, const void *restrict, int, size_t); + +static char * +makebuf(size_t len, int guard_at_end) +{ + char *buf; + size_t alloc_size, page_size; + + page_size = getpagesize(); + alloc_size = roundup2(len, page_size) + page_size; + + buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); + assert(buf); + if (guard_at_end) { + assert(munmap(buf + alloc_size - page_size, page_size) == 0); + return (buf + alloc_size - page_size - len); + } else { + assert(munmap(buf, page_size) == 0); + return (buf + page_size); + } +} + +static void +test_memccpy(const char *s) +{ + char *src, *dst, *expected; + size_t size, bufsize, x; + int i, j; + + size = strlen(s) + 1; + for (i = 0; i <= 1; i++) { + for (j = 0; j <= 1; j++) { + for (bufsize = 0; bufsize <= size + 10; bufsize++) { + src = makebuf(size, i); + memcpy(src, s, size); + dst = makebuf(bufsize, j); + memset(dst, 'X', bufsize); + expected = bufsize >= size ? dst + size : NULL; + assert(memccpy_fn(dst, src, src[size-1], bufsize) == expected); + assert(bufsize == 0 || strncmp(src, dst, bufsize - 1) == 0); + for (x = size; x < bufsize; x++) + assert(dst[x] == 'X'); + } + } + } +} + +static void +test_sentinel(char *dest, char *src, size_t destlen, size_t srclen) +{ + size_t i, effective_len; + void *res, *wantres; + const char *fail = NULL; + char terminator; + + for (i = 0; i < srclen; i++) + /* src will never include (){} */ + src[i] = '0' + i; + + /* source sentinels: not to be copied */ + src[-1] = '('; + src[srclen] = ')'; + + memset(dest, '\xee', destlen); + + /* destination sentinels: not to be touched */ + dest[-1] = '{'; + dest[destlen] = '}'; + + effective_len = srclen < destlen ? srclen : destlen; + wantres = srclen <= destlen ? dest + srclen : NULL; + terminator = src[srclen-1]; + res = memccpy_fn(dest, src, terminator, destlen); + + if (dest[-1] != '{') + fail = "start sentinel overwritten"; + else if (dest[destlen] != '}') + fail = "end sentinel overwritten"; + else if (res != wantres) + fail = "incorrect return value"; + else if (destlen > 0 && memcmp(src, dest, effective_len) != 0) + fail = "string not copied correctly"; + else for (i = srclen; i < destlen; i++) + if (dest[i] != '\xee') { + fail = "buffer mutilated behind string"; + break; + } + + if (fail) + atf_tc_fail_nonfatal("%s\n" + "memccpy(%p \"%s\", %p \"%s\", %u '%c', %zu) = %p (want %p)\n", + fail, dest, dest, src, src, terminator, terminator, destlen, res, wantres); +} + +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) +{ + ATF_CHECK_EQ(memccpy_fn(NULL, "foo", 42, 0), NULL); +} + +ATF_TC(zero_extension); +ATF_TC_HEAD(zero_extension, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Ensure the upper bits of the terminator are ignored"); +} +ATF_TC_BODY(zero_extension, tc) +{ + int mask = -1 & ~UCHAR_MAX; + char buf[16]; + + memset(buf, 0xcc, sizeof(buf)); + ATF_CHECK_EQ(memccpy(buf, "foobar", 'r', sizeof(buf)), buf + sizeof("foobar") - 1); + ATF_CHECK_EQ(memcmp(buf, "foobar", sizeof("foobar") - 1), 0); + + memset(buf, 0xcc, sizeof(buf)); + ATF_CHECK_EQ(memccpy(buf, "foobar", mask | 'r', sizeof(buf)), buf + sizeof("foobar") - 1); + ATF_CHECK_EQ(memcmp(buf, "foobar", sizeof("foobar") - 1), 0); +} + +ATF_TC_WITHOUT_HEAD(bounds); +ATF_TC_BODY(bounds, tc) +{ + size_t i; + char buf[64]; + + for (i = 0; i < sizeof(buf) - 1; i++) { + buf[i] = ' ' + i; + test_memccpy(buf); + } +} + +ATF_TC_WITHOUT_HEAD(alignments); +ATF_TC_BODY(alignments, tc) +{ + size_t srcalign, destalign, srclen, destlen; + char src[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + char dest[15+2+64]; /* 15 offsets + 64 max length + sentinels */ + + for (srcalign = 0; srcalign < 16; srcalign++) + for (destalign = 0; destalign < 16; destalign++) + for (srclen = 1; srclen < 64; srclen++) + for (destlen = 0; destlen < 64; destlen++) + test_sentinel(dest+destalign+1, + src+srcalign+1, destlen, srclen); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + memccpy_fn = dlsym(dl_handle, "test_memccpy"); + if (memccpy_fn == NULL) + memccpy_fn = memccpy; + + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, zero_extension); + ATF_TP_ADD_TC(tp, bounds); + ATF_TP_ADD_TC(tp, alignments); + + return (atf_no_error()); +} From nobody Wed Jan 24 19:44:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYc4wr8z58btv; Wed, 24 Jan 2024 19:44: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 4TKvYc385Wz467P; Wed, 24 Jan 2024 19:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fp22FTXqe0ECiC8xbipz/FI1Ay+MJBLh2zxY/y7ATas=; b=ZDTVvYKEuvRy3elkCHbNQmpfrOn8NnGqywMh8MNT7o+tBz6qpo/kgQ4IYy4k9lHvaOGezw ym8i3rJjleFcy0CefxWGSyNb3kBtYBGVLW38Bj/4kSUTl/5YvAsKmy/2Bmx5PaYlH/NaYl 9JRAFTBbchHb84TTrjWNTS3FMvu0E8OnjHUrTQvCujSYA1vTsLyLlkr0R6Wp168Lwr4HzB satW3gFd0z0YT4hXIXI2GyyafSysuvSOpM3CYGfd88nQnWJsUm71URlpgnxMGzXInwYwjB BFSUjpCNX5owaS6I8WdXAD6gXp7/yOIYfXNdb+vtHDuf9dKwLK6GWkE1cwJq+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fp22FTXqe0ECiC8xbipz/FI1Ay+MJBLh2zxY/y7ATas=; b=RRvt+GJ2CNV7HmtYDYJoSDQf/EmldkF8//Q9SvtSa81fauyFl7xGnBTpkb2n00X6YeqKAz qK3pwnH+W4NF08wQn+ijQY7K86csyz0kSsJT0knMiYuqLsso4ovepd6drNIep7Hycu0U9y ujrNh7fyeLV4gaX7tQDc8lspb/yqoPTUGgBA7oo5qRScpFvfD6Ww+MRa9C6Tobgq7IFHLv Q8pXKlNrwqKABaLUgTqBZ1YrcmuPhYt1Bm5qBB3WnoDtojzdnDuMoEyXI/Nn8X3aNC+/r5 EaezE1xoIl1LLS9d68xmyvA9nlAKa4zQ1tarp2IRm+dueyQPcsBXMIyeLG4FUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125492; a=rsa-sha256; cv=none; b=b5NjEPVPz/34b1cvBf9XXarK2tzWj0IDrC0ssnkEvU4u+4CzsNBPyQcijMqY0kcUE/Nvqg CRvAbmO2q9tNNUYJpIfkwZL+aCgwIo/Nx7LTdPRl9Sjvb1fvxHbMMqgXZ8lOKMoA8gReC1 zvm7WCTcV+GY8sj9aTybErf4ZBZvvyk6bs9qlvQRNlFNW2rGkPteRxRXZ2XiVVcrz/UOEq Zhm/G8/U0or2Z+UtoyrEC7u7T/qe8iRKtd6XE8oJuaSW0DFr7FO9D/ox5fy5BL9ZeGNQ/P lUHPBsbxpT2ozstecD/SXsg14khZrb2eCpsdHt1YsTj9VbTDCkK26jRwduLt7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYc21yvzRmy; Wed, 24 Jan 2024 19:44: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 40OJiqsx005782; Wed, 24 Jan 2024 19:44:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiqfq005779; Wed, 24 Jan 2024 19:44:52 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:52 GMT Message-Id: <202401241944.40OJiqfq005779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 0307a0095ed8 - stable/14 - share/man/man7/simd.7: add forgotten aarch64 string functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0307a0095ed82a0127c4cc3191a980643ad5b0bc Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=0307a0095ed82a0127c4cc3191a980643ad5b0bc commit 0307a0095ed82a0127c4cc3191a980643ad5b0bc Author: Robert Clausecker AuthorDate: 2023-11-29 03:33:18 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:29 +0000 share/man/man7/simd.7: add forgotten aarch64 string functions I previously forgot to mention these as they are set up through contrib/arm-optimized/routines/string. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 (cherry picked from commit 6fdcb85b1c10fb7a7f61323e52ee251cc48fd60e) --- share/man/man7/simd.7 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index e025d3ac9f12..39eafc0e8c5a 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -58,26 +58,26 @@ Enhanced functions are present for the following architectures: .It index Ta S Ta Ta S1 .It ldiv Ta Ta Ta S Ta S .It lldiv Ta Ta Ta S -.It memchr Ta Ta Ta S1 -.It memcmp Ta Ta S Ta S1 Ta S +.It memchr Ta S Ta Ta S1 +.It memcmp Ta S Ta S Ta S1 Ta S .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV -.It memset Ta Ta S Ta S Ta S +.It memset Ta S Ta S Ta S Ta S .It rindex Ta S Ta Ta S1 Ta S -.It stpcpy Ta Ta Ta S1 +.It stpcpy Ta S Ta Ta S1 .It stpncpy Ta Ta Ta S1 .It strcat Ta Ta Ta S1 Ta S .It strchr Ta S Ta Ta S1 Ta S -.It strchrnul Ta Ta Ta S1 -.It strcmp Ta Ta S Ta S1 Ta S -.It strcpy Ta Ta Ta S1 Ta S Ta S2 +.It strchrnul Ta S Ta Ta S1 +.It strcmp Ta S Ta S Ta S1 Ta S +.It strcpy Ta S Ta Ta S1 Ta S Ta S2 .It strcspn Ta Ta Ta S2 .It strlcat Ta Ta Ta S1 .It strlcpy Ta Ta Ta S1 -.It strlen Ta Ta S Ta S1 -.It strncmp Ta Ta S Ta S1 Ta S +.It strlen Ta S Ta S Ta S1 +.It strncmp Ta S Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 -.It strnlen Ta Ta Ta S1 +.It strnlen Ta S Ta Ta S1 .It strrchr Ta S Ta Ta S1 Ta S .It strpbrk Ta Ta Ta S2 .It strsep Ta Ta Ta S2 From nobody Wed Jan 24 19:44:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYg095yz58bwQ; Wed, 24 Jan 2024 19:44: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 4TKvYf4wJsz46GX; Wed, 24 Jan 2024 19:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J3ANVEJ6XxkGzsj6/B71oVubzUUmtIWKoj9MHOwRZoo=; b=eSbhhyO5PFO4YXseC0GQlLdZEspe9Sdkv5Yk43R/GvlhikCkbUXYo6/sAGY3CyrNeYJsDT CSpqKaIn/4TnHTMlPWMFrUaXWl0wWOui8zaMlSrL2rncZ8FXHpvyb+toNsXdW2riy4XrW6 Cem7yiu2uYZtB8I9NlQ0r5kHWymMjWdKy7PXpTu/b0T3DJKEde6jIs6pn2q4W1Z/wgSfTZ QuIi6X/jW+C3wdRF8i1p8H3GmHDiZMidyFfBwP68mDBgIFS2XHX7C3SAX2LqGZYpXcw8Mn L1yfJQLEmsnX84YrGWAJgK/0xOu8tPhs6S93XoTgCEYaNMAtp7nG2o+5PR0mRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J3ANVEJ6XxkGzsj6/B71oVubzUUmtIWKoj9MHOwRZoo=; b=TPlnKI+VD6xBc631rjsQ9DOeQGf1kIvfKCkoYclv+lMDL2jJVXKHjQ21js5B+dFi78zxrv 0yhM0mnHeTDvB7VmfgcyqzginmwDG8FPqLJI/xOvbW/UmzoKZgh9xBMz008leukFjKzqoM sjnjr1yjEDPUsVoSP6WsHCpqxblQP6FFsRbGInYFBge+B/lLdIOgA8S2e6ccTH6a09ChFD C4aozat++o9NwkY3lCtJTlxRSf2Zj9utL/L5c9t00Zd6/PKBKtf+v1KdYf60UyKZh31ZkQ MqdzQFlcG3kzcszIzbHG8zSXtlud7zfTgakRngkX/O/woSViyVGPjXrRxQo2fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125494; a=rsa-sha256; cv=none; b=asGFqfTU/hpYmBj3KipOUhIv6HjeAfnfwv2ZOyOkOkfaBPfUyj2RtRcf6u/yYJshWfWCE0 7JrO01rep3nUHDaXj1r2njW8RSl/w8BLn785aahsGXmX08sAJedbNKl6qZ093bgRmR/Sz/ alYm+Dd8wzd85dFw02OK5HWDgRoB7jU74iRPH/MBLS+aQFXLnZpNk/GQ4hMbbMKSANZJY8 ZMw5sQP6bcbAGs6zHIdnfMNy1VYtcdsBwKSX3EDPuJGmksG+Sri1hw75CCEpczRIOTECEc Vuqi2jyLT6sKitsf6+MCHf1E6Zl2we81obAfJgh58E5TPoO0DcEvdPSJwHC8tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYf41YMzSC1; Wed, 24 Jan 2024 19:44:54 +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 40OJisjo005876; Wed, 24 Jan 2024 19:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJisSE005873; Wed, 24 Jan 2024 19:44:54 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:54 GMT Message-Id: <202401241944.40OJisSE005873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: a3ce82e5b887 - stable/14 - lib/libc/amd64/string: add memccpy scalar, baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a3ce82e5b8878dd8422b6121a529d489f42d37a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a3ce82e5b8878dd8422b6121a529d489f42d37a2 commit a3ce82e5b8878dd8422b6121a529d489f42d37a2 Author: Robert Clausecker AuthorDate: 2023-12-02 12:28:05 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 lib/libc/amd64/string: add memccpy scalar, baseline implementation Based on the strlcpy code from D42863, this patch adds a SIMD-enhanced implementation of memccpy for amd64. A scalar implementation calling into memchr and memcpy to do the job is provided, too. Please note that this code does not behave exactly the same as the C implementation of memccpy for overlapping inputs. However, overlapping inputs are not allowed for this function by ISO/IEC 9899:1999 and neither has the C implementation any code to deal with the possibility. It just proceeds byte-by-byte, which may or may not do the expected thing for some overlaps. We do not document whether overlapping inputs are supported in memccpy(3). Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42902 (cherry picked from commit fc0e38a7a67a6d43095efb00cf19ee5f95dcf710) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/memccpy.S | 259 +++++++++++++++++++++++++++++++++++++ 2 files changed, 260 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 2b1e276cb3da..b569d2cb8be8 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -3,6 +3,7 @@ MDSRCS+= \ bcmp.S \ memchr.S \ memcmp.S \ + memccpy.S \ memcpy.S \ memmove.S \ memset.S \ diff --git a/lib/libc/amd64/string/memccpy.S b/lib/libc/amd64/string/memccpy.S new file mode 100644 index 000000000000..a2d9e33b3d36 --- /dev/null +++ b/lib/libc/amd64/string/memccpy.S @@ -0,0 +1,259 @@ +/* + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE 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 + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + + .weak memccpy + .set memccpy, __memccpy +ARCHFUNCS(__memccpy) + ARCHFUNC(__memccpy, scalar) + ARCHFUNC(__memccpy, baseline) +ENDARCHFUNCS(__memccpy) + +ARCHENTRY(__memccpy, scalar) + push %rbp # establish stack frame + mov %rsp, %rbp + push %rax # dummy push for alignment + push %rbx + push %rdi + push %rsi + + mov %rsi, %rdi + mov %edx, %esi + mov %rcx, %rdx + mov %rcx, %rbx + call CNAME(__memchr) # ptr = memchr(src, c, len) + + pop %rsi + pop %rdi + lea 1(%rax), %rdx + sub %rsi, %rdx # size = ptr - src + 1 + mov %rbx, %rcx + lea (%rdi, %rdx, 1), %rbx # res = dest + size + test %rax, %rax # if (ptr == NULL) + cmovz %rcx, %rdx # size = len + cmovz %rax, %rbx # res = NULL + call CNAME(memcpy) + + mov %rbx, %rax # return (res) + pop %rbx + leave + ret +ARCHEND(__memccpy, scalar) + +ARCHENTRY(__memccpy, baseline) + sub $1, %rcx # RCX refers to last character in buffer + jb .L0 # go to special code path if len was 0 + + movd %edx, %xmm4 + mov %rcx, %rdx + punpcklbw %xmm4, %xmm4 # c -> cc + mov %esi, %ecx + punpcklwd %xmm4, %xmm4 # cc -> cccc + mov %rsi, %r9 # stash a copy of the source pointer for later + pshufd $0, %xmm4, %xmm4 # cccc -> cccccccccccccccc + and $~0xf, %rsi + movdqa %xmm4, %xmm1 + pcmpeqb (%rsi), %xmm1 # NUL found in head? + mov $-1, %r8d + and $0xf, %ecx + shl %cl, %r8d # mask of bytes in the string + pmovmskb %xmm1, %eax + and %r8d, %eax + jnz .Lhead_nul + + movdqa 16(%rsi), %xmm3 # load second string chunk + movdqu (%r9), %xmm2 # load unaligned string head + mov $32, %r8d + sub %ecx, %r8d # head length + length of second chunk + movdqa %xmm4, %xmm1 + pcmpeqb %xmm3, %xmm1 # NUL found in second chunk? + + sub %r8, %rdx # enough space left for the second chunk? + jb .Lhead_buf_end + + /* process second chunk */ + pmovmskb %xmm1, %eax + test %eax, %eax + jnz .Lsecond_nul + + /* string didn't end in second chunk and neither did buffer -- not a runt! */ + movdqa 32(%rsi), %xmm0 # load next string chunk + movdqa %xmm4, %xmm1 + movdqu %xmm2, (%rdi) # deposit head into buffer + sub %rcx, %rdi # adjust RDI to correspond to RSI + movdqu %xmm3, 16(%rdi) # deposit second chunk + sub %rsi, %rdi # express RDI as distance from RSI + add $32, %rsi # advance RSI past first two chunks + sub $16, %rdx # enough left for another round? + jb 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 3f + + movdqu %xmm0, (%rsi, %rdi) + movdqa 16(%rsi), %xmm0 # load next string chunk + movdqa %xmm4, %xmm1 + cmp $16, %rdx # more than a full chunk left? + jb 2f + + add $32, %rsi # advance pointers to next chunk + pcmpeqb %xmm0, %xmm1 # NUL byte encountered? + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 4f + + movdqu %xmm0, -16(%rsi, %rdi) + movdqa (%rsi), %xmm0 # load next string chunk + movdqa %xmm4, %xmm1 + sub $32, %rdx + jae 0b + +1: sub $16, %rsi # undo second advancement + add $16, %edx + + /* 1--16 bytes left in the buffer but string has not ended yet */ +2: pcmpeqb %xmm1, %xmm0 # NUL byte encountered? + pmovmskb %xmm0, %r8d + mov %r8d, %ecx + bts %edx, %r8d # treat end of buffer as end of string + or $0x10000, %eax # ensure TZCNT finds a set bit + tzcnt %r8d, %r8d # find tail length + add %rsi, %rdi # restore RDI + movdqu 1(%rsi, %r8, 1), %xmm0 # load string tail + movdqu %xmm0, 1(%rdi, %r8, 1) # store string tail + lea 17(%rdi, %r8, 1), %rsi # return value if terminator encountered + xor %eax, %eax # return value if no terminator encountered + bt %r8d, %ecx # terminator encountered inside buffer? + cmovc %rsi, %rax # if yes, return pointer, else NULL + ret + +4: sub $16, %rsi # undo second advancement + add $16, %rdx # restore number of remaining bytes + + /* string has ended but buffer has not */ +3: tzcnt %eax, %eax # find length of string tail + movdqu -15(%rsi, %rax, 1), %xmm0 # load string tail (incl. NUL) + add %rsi, %rdi # restore destination pointer + movdqu %xmm0, -15(%rdi, %rax, 1) # store string tail (incl. NUL) + lea 1(%rdi, %rax, 1), %rax # compute return value + ret + +.Lhead_buf_end: + pmovmskb %xmm1, %r8d + add $32, %edx # restore edx to (len-1) + ecx + shl $16, %r8d # place 2nd chunk NUL mask into bits 16--31 + mov %r8d, %r10d + bts %rdx, %r8 # treat end of buffer as if terminator present + xor %eax, %eax # return value if terminator not found + tzcnt %r8, %rdx # find string/buffer len from alignment boundary + lea 1(%rdi, %rdx, 1), %r8 # return value if terminator found + rcx + sub %rcx, %r8 # subtract rcx + bt %rdx, %r10 # was the terminator present? + cmovc %r8, %rax # if yes, return pointer, else NULL + sub %ecx, %edx # find actual string/buffer len + jmp .L0132 + +.Lsecond_nul: + add %r8, %rdx # restore buffer length + tzcnt %eax, %r8d # where is the NUL byte? + lea -16(%rcx), %eax + sub %eax, %r8d # string length + lea 1(%rdi, %r8, 1), %rax # return value if NUL before end of buffer + xor %ecx, %ecx # return value if not + cmp %r8, %rdx # is the string shorter than the buffer? + cmova %r8, %rdx # copy only min(buflen, srclen) bytes + cmovb %rcx, %rax # return NUL if buffer ended before string +.L0132: cmp $16, %rdx # at least 17 bytes to copy (not incl NUL)? + jb .L0116 + + /* copy 17--32 bytes */ + movdqu (%r9), %xmm0 # load first 16 bytes + movdqu -15(%r9, %rdx, 1), %xmm1 # load last 16 bytes + movdqu %xmm0, (%rdi) + movdqu %xmm1, -15(%rdi, %rdx, 1) + ret + +.Lhead_nul: + tzcnt %eax, %r8d # where is the NUL byte? + sub %ecx, %r8d # ... from the beginning of the string? + lea 1(%rdi, %r8, 1), %rax # return value if NUL before end of buffer + xor %ecx, %ecx # return value if not + cmp %r8, %rdx # is the string shorter than the buffer? + cmova %r8, %rdx # copy only min(buflen, srclen) bytes + cmovb %rcx, %rax # return NUL if buffer ended before string + + /* process strings of 1--16 bytes (rdx: min(buflen, srclen), rax: srclen) */ +.L0116: cmp $8, %rdx # at least 9 bytes to copy? + jae .L0916 + + cmp $4, %rdx # at least 5 bytes to copy? + jae .L0508 + + cmp $2, %rdx # at least 3 bytes to copy? + jae .L0304 + + /* copy one or two bytes */ + movzbl (%r9), %ecx # load first byte from src + movzbl (%r9, %rdx, 1), %esi # load last byte from src + mov %cl, (%rdi) # deposit into destination + mov %sil, (%rdi, %rdx, 1) + ret + +.L0304: movzwl (%r9), %ecx + movzwl -1(%r9, %rdx, 1), %esi + mov %cx, (%rdi) + mov %si, -1(%rdi, %rdx, 1) + ret + +.L0508: mov (%r9), %ecx + mov -3(%r9, %rdx, 1), %esi + mov %ecx, (%rdi) + mov %esi, -3(%rdi, %rdx, 1) + ret + +.L0916: mov (%r9), %rcx + mov -7(%r9, %rdx, 1), %rsi + mov %rcx, (%rdi) + mov %rsi, -7(%rdi, %rdx, 1) + ret + + /* length zero destination: return null pointer */ +.L0: xor %eax, %eax + ret +ARCHEND(__memccpy, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Wed Jan 24 19:44:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYh0QwPz58c4G; Wed, 24 Jan 2024 19:44: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 4TKvYg6JNyz465n; Wed, 24 Jan 2024 19:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vijXeMN4VBXYYZx0NthBprgG2tNJvSxpfLtRAexKWTs=; b=ph/otK0287ybCmbU6XdqDqQDtohRAQ1t9JXr2/PcxFOIHIJpgm8htNvzc+o1nEM0od4TT0 hPxUP7CoT8S7FNclj9kTAE87bTHbEv+hM9sCBRQa7NBHyT/Qyfs+zxw6mLIxbfpRYpCWxK P+AxP6fK1ARsSeUumVsXulpvD0YXe/sOskdhE0ldrIzkdOatOR/6EObywnpn/4KEkgUtKM MalbfpD2zWUfXFH1W0mkYnVFfSAUnZqfB9HVMrPl3NGXNcJTmucHpeLcJVad74TrYl0hTX sqfp8HsE69A4Cr9kjTbX0oNZAlysHOaG2MHUseRyGXfNW/8FIJFTSq+3I6OF4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vijXeMN4VBXYYZx0NthBprgG2tNJvSxpfLtRAexKWTs=; b=vQUvF4R+IgmzEw2X5VhO0/Cilirrkwy5Mpg8peNvfXtdGNTJAtJSfAuFy8p1jxyypWrer0 isZ5AOPMf2T2OrI38HI5XvWFGRXyKRPdujzFaSxe8P7hyqLdE4EkiDA7eDvPvkQXQqOlYo WoSONy/d3eMyrLcTujxkdvnt5jNVzX2QHM11lAg+ty3G2vQnteG7HegI92oBcxYCIj22Us qg4787KLb5GOt6xnW14IjNpWSQxz4m1ESmqsL7sdFVOFRWDE2AIZisKnRGg87A/cBpozDS Ye3ON1udu+X8J54dhRUrGWLZcp/xHjmqSklIeEMJT68uZmzrsWOejpAYyZkM5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125495; a=rsa-sha256; cv=none; b=clYALeBPCNa/TWgVDYUA1Lqn0GIroBAsqiL2XX6b4MPpAIU4wdRxTyIDNNRJKD0vR8D6P5 jeDbFVXkaICLotPkPu3fDjtgFaT3ydHgGi9kttgMK4FxV7EpZ1LrngPRW6nVqT7XfduO+j DaklZQFqgRgdZiM+5N2Y9hfEicEHKTnjUGm4dm8u46Bvmno7khJHEQsD7HCQ1zTVwujt11 EZw3V5X16ixkkXzUBd838oJHwocAUCWi5gVX3oQ2PS1WErt1i+Hece6YzF9FiMhBsGy6Lg MDkCemDOQ2JkgtiqkIIBs9FVCSs5vsMLlDLzFSwJ/OFgufvO1asYptVh/zddjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYg57cfzSFN; Wed, 24 Jan 2024 19:44: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 40OJit1O005923; Wed, 24 Jan 2024 19:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJitbd005920; Wed, 24 Jan 2024 19:44:55 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:55 GMT Message-Id: <202401241944.40OJitbd005920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: bd051ed3fed7 - stable/14 - share/man/man7/simd.7: document simd-enhanced memccpy, strncat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bd051ed3fed700693cf64961324b3e50102c897e Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=bd051ed3fed700693cf64961324b3e50102c897e commit bd051ed3fed700693cf64961324b3e50102c897e Author: Robert Clausecker AuthorDate: 2023-12-04 17:16:50 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 share/man/man7/simd.7: document simd-enhanced memccpy, strncat Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: HTTPS://reviews.freebsd.org/D42902 (cherry picked from commit 5fa0fbf40b110e4699032b97a9f540db80997812) --- share/man/man7/simd.7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 39eafc0e8c5a..281898839c24 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd November 28, 2023 +.Dd December 4, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -60,6 +60,7 @@ Enhanced functions are present for the following architectures: .It lldiv Ta Ta Ta S .It memchr Ta S Ta Ta S1 .It memcmp Ta S Ta S Ta S1 Ta S +.It memccpy Ta Ta Ta S1 .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV .It memset Ta S Ta S Ta S Ta S @@ -75,6 +76,7 @@ Enhanced functions are present for the following architectures: .It strlcat Ta Ta Ta S1 .It strlcpy Ta Ta Ta S1 .It strlen Ta S Ta S Ta S1 +.It strncat Ta Ta Ta S1 .It strncmp Ta S Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 .It strnlen Ta S Ta Ta S1 From nobody Wed Jan 24 19:44:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYj1Bgdz58c63; Wed, 24 Jan 2024 19:44: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 4TKvYh71jVz46KD; Wed, 24 Jan 2024 19:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kCGRLS183zoGj5zrjB4XTI0A6ZypdTlZQJG3Q/YkZgE=; b=TgI3l8QX006uEeCcNj9to5y4Y93j2VpmEcpw8FsFs+9IriLwRWKE5aCsCzBI62ATvlXAmN aMsaCktqqgAReZF9bA6HURrfRkr0EU0dRxRK+XM+2NG/A9TaKZqoLMqr1vYrJu33o7Ge/5 jaaPg6tkJoELzz8U9Tt0TlEWDwETIzDeYG37C2UZu2a7GlhrUHY5LNGg0Nm3ADjpP43G30 3S/+3bZIh0EYqo2lgtlxlhUPPjNBgXGQ0mA0OWuOEMWTiIZRlELct9N7LU1D3cTIlS6nCp QCWcLjAMne0rUYPn3z7+0ojU/T+FV5tmqcaX+1dcVfrX6wcYaWyPnlFGix8E1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kCGRLS183zoGj5zrjB4XTI0A6ZypdTlZQJG3Q/YkZgE=; b=dQaqBCY2xkO5OAXQWuIvDsD4mqFupKr8VgVQotK/Jw3UbXCCukrESLQv4mv4CYbtSxtyG8 3I7yyR0CoVd2cYT2869FHtyagjFUFQb0EwjaFC+BUUVX+dUBtwZCJ5PYOOTgJwOe8XYPiS ux5BNIUwRA10lhLo7bso7Z/1UlWjnm9Y9XzmjobdNqOgideGt0sIIJkSPSJS/GOom4V4ft Id/Qzw+NAeIxPEX/rWoPgxgMbgmRTCIFYiRPTfw/FSVQubdXU+RsexnjWD6nKw6+pub1Mq FdsIuVYDbqpOF7jOkuQrPSFCW8c4M8XQeXIsd4t1tbXiyTBHMna/HMEkLECmQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125497; a=rsa-sha256; cv=none; b=uHW130bQYFm78wGAJS7g4P4dXI0ucF1lhhK6fIZpOvS2ZoJkQ/r0/iEqhcHS/b0D4Kcu4i /kvPuV91POg8xgBbVMuswKUm01b/sIQl9JW5oPiB3XeBFHFwYVU42E++Z2SRMNxw2aNmFD t6FyhvjP0wspoR9hy7nl1NThklzfWoI89Ly8lRvyuHVzGANGVj2j8q9k+1N4ykWGcbMzuA EVAnyHeG4Qj+1gHNKOe0U5fDW7tUyyr0dwTrVvbUi/7ATalsmt8rCHcVHXOGhofZZVU4c8 Y9S9puu5ssM8bIuxU2D/vAcA4IoF9snLEg5nZghUE0ur9AVfNq3MJqDUME3smA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYh67KnzRy7; Wed, 24 Jan 2024 19:44: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 40OJiu2S005973; Wed, 24 Jan 2024 19:44:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJiuUP005970; Wed, 24 Jan 2024 19:44:56 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:56 GMT Message-Id: <202401241944.40OJiuUP005970@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: ddab9e646122 - stable/14 - lib/libc/amd64/string: implement strncat() by calling strlen(), memccpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ddab9e646122df077570fc0dfb2af1516c098668 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ddab9e646122df077570fc0dfb2af1516c098668 commit ddab9e646122df077570fc0dfb2af1516c098668 Author: Robert Clausecker AuthorDate: 2023-12-04 17:32:49 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 lib/libc/amd64/string: implement strncat() by calling strlen(), memccpy() This picks up the accelerated implementation of memccpy(). Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42902 (cherry picked from commit ea7b13771cc9d45bf1bc6c6edad8d1b7bce12990) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strncat.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index b569d2cb8be8..a14e8a768f01 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -17,6 +17,7 @@ MDSRCS+= \ strlcat.c \ strlcpy.S \ strlen.S \ + strncat.c \ strncmp.S \ strncpy.c \ strnlen.c \ diff --git a/lib/libc/amd64/string/strncat.c b/lib/libc/amd64/string/strncat.c new file mode 100644 index 000000000000..33b278ac5e04 --- /dev/null +++ b/lib/libc/amd64/string/strncat.c @@ -0,0 +1,29 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include + +void *__memccpy(void *restrict, const void *restrict, int, size_t); + +char * +strncat(char *dest, const char *src, size_t n) +{ + size_t len; + char *endptr; + + len = strlen(dest); + endptr = __memccpy(dest + len, src, '\0', n); + + /* avoid an extra branch */ + if (endptr == NULL) + endptr = dest + len + n + 1; + + endptr[-1] = '\0'; + + return (dest); +} From nobody Wed Jan 24 19:44:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYk4Q0bz58bwZ; Wed, 24 Jan 2024 19:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYk14ylz466C; Wed, 24 Jan 2024 19:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/KNHCKWigf3ZQqUg7dOq2O730bQzuyuMN82qINC674M=; b=IuzoU2qOLq/4vFTfSkAIO5NoOrz5PpqXr36I783YqftiwOXY5rZDfU5qGltg8sdRZpzkhs dXEI25En9v7ocZBXzP7BMmiQjaT39tPxqnQFLF/F/LSg1Iv0xCvBsLI0msy0kXJTXT0mUw PWJnHsLNPdR2MnUw+5ms1pzew2Srl9OmsZJDmeaJKE55bw0t5Rnj8/X4XJcI7xJcoPrwEH HWawbfWCk5P+Gr3zx7zGGlNHVwBPGBSucfA2P+OywU+UEP5dd8johCHVTJuKsWO+AOVZlB +xgNeiUIf3mzBR5nZvcJPLEA4I4MCrac+zT+GGHbBuVDknesAR6GW+6Z4+qEhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/KNHCKWigf3ZQqUg7dOq2O730bQzuyuMN82qINC674M=; b=pETBZ7QH1AeDdjBohhKtPiUCl+reLPsh5DqiW9nilnnGZBUkcjBKYbiZ+6wNDUawDOBDbo H9lPfnGZx7Z5WDHWQfcBM6bnsx5eJ94rNI2aTYubuWSWVNke1x7+2td3WWw58luQlsREOR B0tNUKkIyuyvmppKy6xfIAzKWFQSMu1vQBpS7CP/9DJpfrKVLWO9/XQYP4nKyOSM4RsZ6q mO6XiMs1Ft/bPAqQiSSqiIVz2pq6iXMsDhcjCsILqvYDBZrsSa+5tLhEKbR2JjqgcYyGkT nd8L/qhvLVX7FJvhoLaj2zxiosshpbj85YlbJ7yDz/Tg2KGZhhXGwkdGjArs2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125498; a=rsa-sha256; cv=none; b=DktKAtOdiFyYa0a0oBdop934IPBfzYDqMxxXZUlU5pU3jk+7iMAPxHwBPuqB88dgLcKRpP RX1lJMausEKeYc4jllKIR6ci/EKijtGZSzLqGnFTQ5d8jagTk7gNKRKAJCp9vJl6iDvIOh 9BPfvaWWDrrh6rzalySS1MuErM+grwi/in5bdnFZMLVyBCjHFVb9P4f9yNJqZZhPRzsHOS Ae/kPzl+3EVHuxvYcRHHGC9brW2bipQf1KTdb/lewU5/H6sXNErL/h2Pt7FJH4bp5pN157 S7Yga5ZORwQRm927TIP3r84HHNQdlPyTuLDpO6/9HzCjL5L6Aed1+1DaaaY7Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYk0BQFzS8x; Wed, 24 Jan 2024 19:44: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 40OJivk8006025; Wed, 24 Jan 2024 19:44:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJivu6006022; Wed, 24 Jan 2024 19:44:57 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:57 GMT Message-Id: <202401241944.40OJivu6006022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 667fa9c40483 - stable/14 - lib/libc/string: document restrict qualification of memccpy() arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 667fa9c40483f2c844a7960780e9567be4e581d5 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=667fa9c40483f2c844a7960780e9567be4e581d5 commit 667fa9c40483f2c844a7960780e9567be4e581d5 Author: Robert Clausecker AuthorDate: 2023-12-05 14:03:28 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 lib/libc/string: document restrict qualification of memccpy() arguments POSIX.1-2004 and the upcoming C23 agree that memccpy()'s arguments are restrict qualified and must not overlap. In 2002, restrict qualifiers were added to 's declaration of the function. Make things official and document that the arguments must not overlap. See also: 61b60edfd3fff20f884419f8097870c7045315c9 Approved by: kib MFC after: 1 month MFC to: stable/14 (cherry picked from commit e0d4f419ac41aa91b862f3ceadc32a86abf08572) --- lib/libc/string/bstring.3 | 10 ++++++++-- lib/libc/string/memccpy.3 | 33 ++++++++++++++++++++++++++++++--- lib/libc/string/memccpy.c | 2 +- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3 index cb29a6db6b14..bb1a0505fafd 100644 --- a/lib/libc/string/bstring.3 +++ b/lib/libc/string/bstring.3 @@ -29,7 +29,7 @@ .\" .\" @(#)bstring.3 8.1 (Berkeley) 6/4/93 .\" -.Dd June 4, 1993 +.Dd December 5, 2023 .Dt BSTRING 3 .Os .Sh NAME @@ -58,7 +58,12 @@ .Ft int .Fn memcmp "const void *b1" "const void *b2" "size_t len" .Ft void * -.Fn memccpy "void *dst" "const void *src" "int c" "size_t len" +.Fo memccpy +.Fa "void * restrict dst" +.Fa "const void * restrict src" +.Fa "int c" +.Fa "size_t len" +.Fc .Ft void * .Fn memcpy "void *dst" "const void *src" "size_t len" .Ft void * @@ -80,6 +85,7 @@ See the specific manual pages for more information. .Xr memccpy 3 , .Xr memchr 3 , .Xr memcmp 3 , +.Xr memccpy 3 , .Xr memcpy 3 , .Xr memmove 3 , .Xr memset 3 diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3 index fb2409ada846..fe543d9172d3 100644 --- a/lib/libc/string/memccpy.3 +++ b/lib/libc/string/memccpy.3 @@ -27,7 +27,7 @@ .\" .\" @(#)memccpy.3 8.1 (Berkeley) 6/9/93 .\" -.Dd June 9, 1993 +.Dd December 5, 2023 .Dt MEMCCPY 3 .Os .Sh NAME @@ -38,7 +38,12 @@ .Sh SYNOPSIS .In string.h .Ft void * -.Fn memccpy "void *dst" "const void *src" "int c" "size_t len" +.Fo memccpy +.Fa "void * restrict dst" +.Fa "const void * restrict src" +.Fa "int c" +.Fa "size_t len" +.Fc .Sh DESCRIPTION The .Fn memccpy @@ -61,13 +66,35 @@ is returned. Otherwise, .Fa len bytes are copied, and a NULL pointer is returned. +If +.Fa src +and +.Fa dst +overlap, behavior is undefined. .Sh SEE ALSO .Xr bcopy 3 , .Xr memcpy 3 , .Xr memmove 3 , .Xr strcpy 3 +.Sh STANDARDS +The +.Fn memccpy +function conforms to +.St -p1003.1-2004 +and +.\" St -isoC-2024 . +ISO/IEC 9899:2024 (\(lqISO\~C23\(rq). .Sh HISTORY The .Fn memccpy function first appeared in -.Bx 4.4 . +.Bx 4.4 +and was first specified in the +.\" St -svid1 . +System\~V Interface Definition, First Edition (\(lqSVID1\(rq). +The +.Ft restrict +keyword was added to the prototype in +.Fx 5.0.0 +in accordance with the updated specification of +.St -p1003.1-2004 . diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c index fd080d4293f4..5ef2dd6567ca 100644 --- a/lib/libc/string/memccpy.c +++ b/lib/libc/string/memccpy.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)memccpy.c 8.1 (Berkeley) 6/4/93"; #include void * -memccpy(void *t, const void *f, int c, size_t n) +memccpy(void * restrict t, const void * restrict f, int c, size_t n) { if (n) { From nobody Wed Jan 24 19:44:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYl5Ftvz58c69; Wed, 24 Jan 2024 19:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvYl28lSz46CH; Wed, 24 Jan 2024 19:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLWd8Lr5ByUSBn0qc1l0Z+D30gW5K1Se/mOvBoR6lBc=; b=D4WnR4+K0UxKdjM6UAIuI5fRh9Nr/XK2jfBhHbL6iA8XOmKRkSME5QqvnwbgDEAziHkl5G 7Ik4fgbNVQWb4PKncPKlPeHuWyt5AVq7ifSidL5OyJq1YiE/D02AiKcDnfjQVqtdzTREdb gTKiluIGRvclQfC4g/E8jmzKJF4EVsn7Nb061Z5ujRV9b3nG4yBfJvyICzfGIntM+0HFnp 3hkTZWXGdiOl8kNI4mLZoSH1T5vdjxgjz2lBzKP0nk+26XzStuwmYYOG/UkrF7oWK175J8 dE02/bPGgVogKbskTKbfOrykcPfqvoGAGYHqYwFmQutFQP6FlOt6q//1aVt2cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLWd8Lr5ByUSBn0qc1l0Z+D30gW5K1Se/mOvBoR6lBc=; b=dmrEoyOLDIeuWqUO/Srv1OXb0EErY19mzpvA6uwPZB3dVvx1POdRuttN60NQnbkVVuxnba 3lVc+ttdvEeqHWdmFTMggbNywftzPl2uoRmGrncJlCpYhUAi3q3+o0GMHTpYXHue3lYX+q aFN2zyRRyVC5pq+PVx13z5iWUhHOhh4UwKDoOWNSh0stE8S9k0Mp9Roa0BArykbzhIuR4c MzEwmbpCMgNlP8zI9VRmGKfxAoASkaqsdgId9/yH0UU+xraUKZnX/Tbe+vgUPUwOQwjdJ0 SmXkqkp5o0ffPWG/XwiicWKOV6KD3xsI6qRf1HV46JjWLXXTDbqAwGNAu+/l8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125499; a=rsa-sha256; cv=none; b=c/m5FSYpvyhBzTZU+1yOwW095EZSvMTtso3hMscVcPNDa5bIP3QQd23VO0bjqSlN/7Qlka MMP7ZG8Y7JEScCGPKphOfS3/stqnILe2ROi9TxIQSG9AmNd5RCD9iwZ4jwxqFO0YtvBfMY A0BitW8WvH866yElWqewIrX7wIErE9JiXnSxTgJOnGU6xaSIAJ6ta4VglLoW6KZ5SU4L5S G+o5plyFKVNxDE/8nRGlMFfaT4Puexbmsz8KVMzQ9N7SSv8J/m9r9Cjfmt9uodzzXWXOtG 2lSIq/fGzap6KTaNJpUtsuaL7TWRaPerOiy69Qkir4jXnApwbuIq3otDO+1PCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYl1Cj2zS8y; Wed, 24 Jan 2024 19:44: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 40OJixel006069; Wed, 24 Jan 2024 19:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJixcS006066; Wed, 24 Jan 2024 19:44:59 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:44:59 GMT Message-Id: <202401241944.40OJixcS006066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: acb47064d658 - stable/14 - lib/libc/tests/string: add memrchr unit tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: acb47064d65813386dc15f6278037f1a76ec7eab Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=acb47064d65813386dc15f6278037f1a76ec7eab commit acb47064d65813386dc15f6278037f1a76ec7eab Author: Robert Clausecker AuthorDate: 2023-12-06 09:11:40 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:30 +0000 lib/libc/tests/string: add memrchr unit tests The "values" test case is specifically crafted to detect the off-by-one error previous discovered in the scalar strchrnul implementation. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42925 (cherry picked from commit 691ff1832e09a6ccbc8f5b04c88cafc7452b3ce6) --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/memrchr_test.c | 116 +++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index a6e8eb18075a..4fce79685c0e 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C+= flsl_test ATF_TESTS_C+= flsll_test ATF_TESTS_C+= memccpy_test ATF_TESTS_C+= memcmp_test +ATF_TESTS_C+= memrchr_test ATF_TESTS_C+= memset_s_test ATF_TESTS_C+= strncmp_test ATF_TESTS_C+= stpncpy_test diff --git a/lib/libc/tests/string/memrchr_test.c b/lib/libc/tests/string/memrchr_test.c new file mode 100644 index 000000000000..12f696c9dc1e --- /dev/null +++ b/lib/libc/tests/string/memrchr_test.c @@ -0,0 +1,116 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include +#include +#include + +#include + +static void *(*memrchr_fn)(const void *, int, size_t); + +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) +{ + ATF_CHECK_EQ(memrchr_fn(NULL, 42, 0), NULL); +} + +ATF_TC_WITHOUT_HEAD(not_found); +ATF_TC_BODY(not_found, tc) +{ + size_t i, j; + char buf[1+15+64+1]; /* offset [0..15] + 64 buffer bytes + sentinels */ + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) { + buf[i + j + 1] = 'X'; + ATF_CHECK_EQ(memrchr_fn(buf + i + 1, 'X', j), NULL); + buf[i + j + 1] = '-'; + } +} + +static void +do_found_test(char buf[], size_t len, size_t first, size_t second) +{ + /* invariant: first <= second */ + + buf[first] = 'X'; + buf[second] = 'X'; + ATF_CHECK_EQ(memrchr_fn(buf, 'X', len), buf + second); + buf[first] = '-'; + buf[second] = '-'; +} + +ATF_TC_WITHOUT_HEAD(found); +ATF_TC_BODY(found, tc) +{ + size_t i, j, k, l; + char buf[1+15+64+1]; + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k < j; k++) + for (l = 0; l <= k; l++) { + buf[i + j + 1] = 'X'; + do_found_test(buf + i + 1, j, l, k); + buf[i + j + 1] = '-'; + } +} + +/* check that the right character is found */ +static void +do_values_test(unsigned char buf[], size_t len, size_t i, int c) +{ + /* sentinels */ + buf[-1] = c; + buf[len] = c; + memset(buf, c + 1, len); + + if (i < len) { + buf[i] = c; + ATF_CHECK_EQ(memrchr_fn(buf, c, len), buf + i); + } else + ATF_CHECK_EQ(memrchr_fn(buf, c, len), NULL); +} + +ATF_TC_WITHOUT_HEAD(values); +ATF_TC_BODY(values, tc) +{ + size_t i, j, k; + int c; + unsigned char buf[1+15+64+1]; + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k <= j; k++) + for (c = 0; c <= UCHAR_MAX; c++) + do_values_test(buf + i + 1, j, k, c); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + memrchr_fn = dlsym(dl_handle, "test_memrchr"); + if (memrchr_fn == NULL) + memrchr_fn = memrchr; + + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, not_found); + ATF_TP_ADD_TC(tp, found); + ATF_TP_ADD_TC(tp, values); + + return (atf_no_error()); +} From nobody Wed Jan 24 19:45:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYm5X9Jz58bf6; Wed, 24 Jan 2024 19:45: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 4TKvYm37G0z46HY; Wed, 24 Jan 2024 19:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiJB/Q0x9aSaKSJuS7hfOH3dB4o9lLJjZoMqCclzisE=; b=tw/YJ9/Qq83gBoJ0l00o/ItQbB/fb7t9afb1BvXiQ9NEvJkT+QmQWzoIk1RwqPJm/IfQwC WvN4hPoBtHVCB6FWAHshU8NTyuthnin6NDAcV9Ox7jGNS9BBvTLbQkJXo0h6ZXVlxzqLyf 8NCZt6hH6pM8PcaUlSiBItWdU/OeN8xjXNumKq/M/C2TTqAnQQ4oMxbzbUKgSspl3YLb+e elWftrGA0v9vP3oUCbVGJltUg2UUka72stiVYpGEfG2g3Y4pip9m5K1wnWOsUvAXGowP72 Rg0s0A53KgkQWA5Cfx3FMgb7WWLdt7+ou3iNHKDkP0dxeP8WOrzyUSBGpjaYhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiJB/Q0x9aSaKSJuS7hfOH3dB4o9lLJjZoMqCclzisE=; b=NoJec3fAZV9CCmjStf38aQYI6eAXZTUTmqEEVCLk+V99bBxPZv2idhPlkiIPXwy7EyzWq5 Af6y9zJ5NVkngYjJcOcY99kzTDNgCYHAcG+t11r4hmU7oSG4di7pjuraM2nF+dCI3mNC83 EL8XgXUQ2Om5fIhvmxyt1UPvGB73YgTvcNvKcMRfLuZ62H7DJbMFAyxR2XOaYB0adk9Q0N VaaAW1QOui0nfISkmgV98wZZk3geRjz0+qm2vV90omc2xaA+vYfZjuU3RnCMnHqkzPTXSr ouMNlklkd4gxoJ7ozWWR3k022IlHL0XmoDSCiHBeCN44B3Tf30ZUjswyj6DM+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125500; a=rsa-sha256; cv=none; b=Yso3o0n5jxQry5Nyzf9kR491JEcRyWs0FSzHlPMDHpI5IrY1vm7o14k5grXDRq1sO628gw Rx10fSgV9AHVzQIykXv2GH6u3NZF3NOWkvyFtz2kruQkSdrxAc28o3wQHDz+MPn/x9H3Ky DWr/ITsvTf4E2n7EV/V8hr/2sBwAwt7l5H2R5+Ny0XLKXzy5S7uozvK2UvNkyEiLKePHms GIzFsTyaDdYUeiB1pa9FFwsDlFFJIJ84zFsTHXYceBHO0EfvBfz6I1dG1Cnf7WZoWjKjNQ CsH2BMWu3Fk5AsQHA4jMjYhendFIRQDJ9UG4kMPZrmAGUo2fdZqR9MOOEG+c0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYm2CByzRgq; Wed, 24 Jan 2024 19:45: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 40OJj0GZ006129; Wed, 24 Jan 2024 19:45:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJj03c006126; Wed, 24 Jan 2024 19:45:00 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:45:00 GMT Message-Id: <202401241945.40OJj03c006126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: ff7799e00311 - stable/14 - lib/libc/amd64/string: add memrchr() scalar, baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ff7799e003110a8188bc129e663d23b54755531f Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ff7799e003110a8188bc129e663d23b54755531f commit ff7799e003110a8188bc129e663d23b54755531f Author: Robert Clausecker AuthorDate: 2023-12-06 10:05:47 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:31 +0000 lib/libc/amd64/string: add memrchr() scalar, baseline implementation The scalar implementation is fairly simplistic and only performs slightly better than the generic C implementation. It could be improved by using the same algorithm as for memchr, but it would have been a lot more complicated. The baseline implementation is similar to timingsafe_memcmp. It's slightly slower than memchr() due to the more complicated main loop, but I don't think that can be significantly improved. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42925 (cherry picked from commit fb197a4f7751bb4e116989e57ba7fb12a981895f) --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/memrchr.S | 166 +++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index a14e8a768f01..b1369841bc74 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -6,6 +6,7 @@ MDSRCS+= \ memccpy.S \ memcpy.S \ memmove.S \ + memrchr.S \ memset.S \ stpcpy.S \ stpncpy.S \ diff --git a/lib/libc/amd64/string/memrchr.S b/lib/libc/amd64/string/memrchr.S new file mode 100644 index 000000000000..4f6c5a238daa --- /dev/null +++ b/lib/libc/amd64/string/memrchr.S @@ -0,0 +1,166 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4, 0x90 + +ARCHFUNCS(memrchr) + ARCHFUNC(memrchr, scalar) + ARCHFUNC(memrchr, baseline) +ENDARCHFUNCS(memrchr) + +ARCHENTRY(memrchr, scalar) + xor %eax, %eax # prospective return value + sub $4, %rdx # 4 bytes left to process? + jb 1f + + ALIGN_TEXT +0: xor %r8, %r8 + lea 2(%rdi), %r10 + cmp %sil, 2(%rdi) + cmovne %r8, %r10 # point to null if no match + + cmp %sil, (%rdi) + cmove %rdi, %r8 # point to first char if match + + lea 1(%rdi), %r9 + cmp %sil, 1(%rdi) + cmovne %r8, %r9 # point to first result if no match in second + + lea 3(%rdi), %r11 + cmp %sil, 3(%rdi) + cmovne %r10, %r11 + + test %r11, %r11 + cmovz %r9, %r11 # take first pair match if none in second + + test %r11, %r11 + cmovnz %r11, %rax # take match in current set if any + + add $4, %rdi + sub $4, %rdx + jae 0b + +1: cmp $-3, %edx # a least one character left to process? + jb 2f + + cmp %sil, (%rdi) + cmove %rdi, %rax + + lea 1(%rdi), %rcx + cmp $-2, %edx # at least two characters left to process? + jb 2f + + cmp %sil, 1(%rdi) + cmove %rcx, %rax + + lea 2(%rdi), %rcx + cmp $-1, %edx # at least three character left to process? + jb 2f + + cmp %sil, 2(%rdi) + cmove %rcx, %rax + +2: ret +ARCHEND(memrchr, scalar) + +ARCHENTRY(memrchr, baseline) + movd %esi, %xmm4 + test %rdx, %rdx # empty buffer? + jz .L0 # if yes, return immediately + + punpcklbw %xmm4, %xmm4 # c -> cc + mov %edi, %ecx + punpcklwd %xmm4, %xmm4 # cc -> cccc + and $~0xf, %rdi # align source pointer + pshufd $0, %xmm4, %xmm4 # cccc -> cccccccccccccccc + and $0xf, %ecx + movdqa %xmm4, %xmm0 + mov $-1, %r8d + pcmpeqb (%rdi), %xmm0 # compare aligned head + shl %cl, %r8d # mask of bytes in the head of the buffer + pmovmskb %xmm0, %eax + + sub $16, %rcx + and %r8d, %eax # match mask + add %rcx, %rdx # advance past head + cmc + jbe .Lrunt # did the string end in the buffer? + + mov %rdi, %rsi # pointer to matching chunk + add $16, %rdi + sub $16, %rdx # enough left for another round? + jbe 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa %xmm4, %xmm0 + pcmpeqb (%rdi), %xmm0 + pmovmskb %xmm0, %r8d + + cmp $16, %rdx # enough left for second chunk? + jbe 2f + + movdqa %xmm4, %xmm0 + pcmpeqb 16(%rdi), %xmm0 + pmovmskb %xmm0, %ecx + + lea 16(%rdi), %r9 + test %ecx, %ecx # match found in second chunk? + cmovz %r8d, %ecx # if not, use match data from first chunk + cmovz %rdi, %r9 + + test %ecx, %ecx # any match found? + cmovnz %ecx, %eax # if yes, overwrite previously found match + cmovnz %r9, %rsi + + add $32, %rdi # advance to next iteration + sub $32, %rdx # advance to next chunks + ja 0b + + /* process remaining 1--16 bytes */ +1: pcmpeqb (%rdi), %xmm4 + mov $0xffff, %r8d + xor %ecx, %ecx + sub %edx, %ecx # number of bytes to be masked out + pmovmskb %xmm4, %r9d + shr %cl, %r8d # mask of bytes to be kept in the buffer + and %r9d, %r8d + cmovnz %r8d, %eax + cmovnz %rdi, %rsi + bsr %eax, %eax + lea (%rsi, %rax, 1), %rsi # pointer to match (or junk) + cmovnz %rsi, %rax # if any match was found, return it + ret + + /* end of chunk reached within first half iteration */ +2: test %r8d, %r8d # match in previous chunk? + cmovnz %r8d, %eax # if yes, overwrite previous chunks + cmovnz %rdi, %rsi + add $16, %rdi # point to tail + sub $16, %edx + jmp 1b # handle tail the same otherwise + + /* runt: string ends within head, edx has negated amount of invalid head bytes */ +.Lrunt: mov $0xffff, %r8d + xor %ecx, %ecx + sub %edx, %ecx + shr %cl, %r8d + and %r8d, %eax + bsr %eax, %eax + lea (%rdi, %rax, 1), %rdi + cmovnz %rdi, %rax + ret + + /* empty buffer: return a null pointer */ +.L0: xor %eax, %eax + ret +ARCHEND(memrchr, baseline) + + .section .note.GNU-stack, "", %progbits From nobody Wed Jan 24 19:45:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvYp0Dt0z58c2d; Wed, 24 Jan 2024 19:45: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 4TKvYn48n6z46Cq; Wed, 24 Jan 2024 19:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwaeRrenVEyGjBrq+9lnHN0FwhRBrKeWFijZoUjZKMM=; b=ZOZUtGjLeNjO08QE2z4wI49DWCuUDRvyyvr1XfNXrAKup3jeXTTaB2t/vQv0jnRbopuAJG OzEqUyQyLofUSu67H08hiu0aXnTB7H8BdIFS8SSqiAO4DzKQ4n9m2/0gCs3rwhZ7AY9qrm EaIpJnLlcx3nA5H8EKTimCIUDj1AKqhb5dF5slz+SgAlUO51Et50TR5ICOytFT88vEsvDW OGS/JAlA7xFoejSGVoYqjtKkfFDinBR2p1SflijeV6nK0UBjS0ksqvAbEP5By0f3nIcRDv sn5RB7XVc3+3eJHs6Q3qB7k2K/uUcOOictP+9/SVpsVoIvo0oVtTg5pvOcIgqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwaeRrenVEyGjBrq+9lnHN0FwhRBrKeWFijZoUjZKMM=; b=cWejtNHSMRpH0/7Zy8mcAeSE15di3xBPUtqWumTL/aG4Gcwj98c8gB9FVsnfJG15CiJHbT /uRaTcs8AD9U/80G6GMWfFOVSsUOm27oIMxN9qMBrIwE41cALUDikbTWOPUXcCFNADWO9l CIFEmNExf6Wy5kZIPVl2wJnFQAg38yB18zIU+/TyBwCPUTbv0vfPYVAfOo69bYfj5JiNsJ Mt4HYihqxnjF9tIGVSv9EdTtE8e6DKw+RmNnK/4IiovL5XzSCbRhmt6PJlVAo/weZf4rom vM/E0S5NrFqMkwDMMHulEMvzUFH+0xyajSHmBcUJUswmXyyP4IFdhsL399/sFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125501; a=rsa-sha256; cv=none; b=FruRp8LvNQra/0xGdePZ49zNnDf5dTMGayoErSvfmw51oyLpgNOOgZp8FndYVl5I2H5RSu LwrcUJTiMHpXNP9QTOzlKVjVxpX/PP+VWE71OZm/SvIZkGfQDeJMdPcOWoLUe+0l4EMFBI 28y6GTThVPbfEqUnDUG1qV5Aa+vWTFcPFDqO7sZcKejXh49BTIdshnT9hSQ5V3zl7OVF/q xzrBkGYf9gOg1JUiDAuycWTCLeXZsdZAB8M5F6ClR8sRmy/SdpkxDfVusj/kFgn1v4K36j G207VTuhtVy486BgH5RcSREf6kDdfLM2Vq/aDUVaw5TH9KEaLZd8erfYCdsXhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvYn3DBhzS6N; Wed, 24 Jan 2024 19:45: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 40OJj12v006176; Wed, 24 Jan 2024 19:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJj1iJ006172; Wed, 24 Jan 2024 19:45:01 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:45:01 GMT Message-Id: <202401241945.40OJj1iJ006172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 3f2c2dda2631 - stable/14 - share/man/man7/simd.7: document SIMD-enhanced memrchr implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f2c2dda263114c46d14c23b14f989118ab1a730 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3f2c2dda263114c46d14c23b14f989118ab1a730 commit 3f2c2dda263114c46d14c23b14f989118ab1a730 Author: Robert Clausecker AuthorDate: 2023-12-06 13:47:03 +0000 Commit: Robert Clausecker CommitDate: 2024-01-24 19:39:31 +0000 share/man/man7/simd.7: document SIMD-enhanced memrchr implementation Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 (cherry picked from commit fb9c25a91fcf4005141eeb81ce49f4399c425d32) --- share/man/man7/simd.7 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 281898839c24..fd9485524aef 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd December 4, 2023 +.Dd December 6, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -63,6 +63,7 @@ Enhanced functions are present for the following architectures: .It memccpy Ta Ta Ta S1 .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV +.It memrchr Ta Ta Ta S1 .It memset Ta S Ta S Ta S Ta S .It rindex Ta S Ta Ta S1 Ta S .It stpcpy Ta S Ta Ta S1 From nobody Wed Jan 24 19:48:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvf02tqGz58cPn; Wed, 24 Jan 2024 19:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKvf02Krmz4Gt7; Wed, 24 Jan 2024 19:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gj9wbsUswnDuSUggRKe8MaL8uLetPdQvV5U9SVywkmM=; b=SurTIHRuiQqDa/eqTV9ZzrPzhGh+AYqLxuV5JMiSpDkzTYVVjFGlZvupBY5xmxNdcL5go7 Hh0JulivFZWXC4nbWtheWgF8CayqkaszRR+VCozazFe9hMi2H2fqQMArOgLyC7lnhlax1M zoQM+Zq4mnoN2ADpYI6falyhNzBAF7Lot8YZ4kqBcI6TtV37ZywbN5CW7BceD/QKSo2yFg x3V18WHFlIMKQvFzl0Vlj9Jgm5JEBp3osUnqDaUsKaV/aXfiuO+HMxehI7HS9TNO7AFP6G c8Am6Z90K9yLAVignOCluJSPaI8QlU6kL+D+e+NJNspDmSfDK6edqgope7VIJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gj9wbsUswnDuSUggRKe8MaL8uLetPdQvV5U9SVywkmM=; b=HBFeiPUKgRR90jPydK2r/D4odVYZKL9Bc7inhqrRSk8OdYb6VfYZQx25LCpo+8g69rNL2C xGEYSAOTu5m20PEHiOZhlBvyDClE1LNWjRuZLSjWQAakbtAcHm/ggPS2zESr0rsXcK2JRQ 3pFXeEbwTL0/6jqcY8nogLsV4Nx0M9Lh20AtjR1sI4uKgiSdmTZcqeUARIBaYPyqed3Wdw olz3GxWI53n4Agq2ORV0OINDu0u7TSB/QRABtMS8IEx35tQs0GvXzDpB4ZADT6lPjVUO1s c+7kwft9Y6BFMCFiIszH8HYipRwd7yzBh81WLx6Mqy8gfJ2vkS/wttQea1i5Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125720; a=rsa-sha256; cv=none; b=plZ42NcNci0jFCk+ic8LIBVnI4P0Nvv6AFUV7W0ehWxpFNGuK4KYZ/5MjoYYFAYtC5saJK oxNG3vhxr9p7VZxrwopheOXE07rp+3BQKB88wIZMI1qTpRMHekeGJ4kujs7Ymw4+pB+q3h K0GzfPxp3+bwZJvgDUWM+wCqZX59ECjQ64WeZuEFcv3ANYcri4h+616rSaAGp2S6BZ39zo FBoag2qFviGBb58in7VQpHB6s2LeC4eQv7Vp622efNhGMAn0rCkwtY4iUU4nfNg/dxlkfw 4J5SNTVjkxxjx6j68M5H/uAWLoN4MI9D9LvWSRssUgDbrs5723ztrqvd/c1dww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvf01N9RzRyP; Wed, 24 Jan 2024 19:48: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 40OJmekF007134; Wed, 24 Jan 2024 19:48:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJmeWQ007131; Wed, 24 Jan 2024 19:48:40 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:48:40 GMT Message-Id: <202401241948.40OJmeWQ007131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 5738d741fb79 - main - kern: tty: fix recanonicalization List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5738d741fb796c1f0a6b5c2157af7de58104ac97 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5738d741fb796c1f0a6b5c2157af7de58104ac97 commit 5738d741fb796c1f0a6b5c2157af7de58104ac97 Author: Kyle Evans AuthorDate: 2024-01-24 19:36:26 +0000 Commit: Kyle Evans CommitDate: 2024-01-24 19:48:31 +0000 kern: tty: fix recanonicalization `ti->ti_begin` is actually the offset within the first block that is unread, so we must use that for our lower bound. Moving to the previous block has to be done at the end of the loop in order to correctly handle the case of ti_begin == TTYINQ_DATASIZE. At that point, lastblock is still the last one with data written and the next write into the queue would advance lastblock. If we move to the previous block at the beginning, then we're essentially off by one block for the entire scan and run the risk of running off the end of the block queue. The ti_begin == 0 case is still handled correctly, as we skip the loop entirely and the linestart gets recorded as the first byte available for writing. The bit after the loop about moving to the next block is also still correct, even with both previous fixes in mind: we skipped moving to the previous block if we hit ti_begin, and `off + 1` would in-fact be a member of the next block from where we're reading if it falls on a block boundary. Reported by: dim Fixes: 522083ffbd1ab ("kern: tty: recanonicalize the buffer on [...]") --- sys/kern/tty_inq.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/kern/tty_inq.c b/sys/kern/tty_inq.c index 533fdfd30ce9..589d958e59fa 100644 --- a/sys/kern/tty_inq.c +++ b/sys/kern/tty_inq.c @@ -371,12 +371,9 @@ ttyinq_canonicalize_break(struct ttyinq *ti, const char *breakc) /* Start just past the end... */ off = ti->ti_end; - canon = 0; - - while (off > 0) { - if ((off % TTYINQ_DATASIZE) == 0) - tib = tib->tib_prev; + canon = ti->ti_begin; + while (off > ti->ti_begin) { off--; boff = off % TTYINQ_DATASIZE; @@ -384,20 +381,23 @@ ttyinq_canonicalize_break(struct ttyinq *ti, const char *breakc) canon = off + 1; break; } + + if (off != ti->ti_begin && boff == 0) + tib = tib->tib_prev; } - MPASS(canon > 0 || off == 0); + MPASS(canon > ti->ti_begin || off == ti->ti_begin); /* - * We should only be able to hit bcanon == 0 if we walked everything we - * have and didn't find any of the break characters, so if bcanon == 0 - * then tib is already the correct block and we should avoid touching - * it. + * We should only be able to hit canon == ti_begin if we walked + * everything we have and didn't find any of the break characters, so + * if canon == ti_begin then tib is already the correct block and we + * should avoid touching it. * * For all other scenarios, if canon lies on a block boundary then tib * has already advanced to the previous block. */ - if (canon != 0 && (canon % TTYINQ_DATASIZE) == 0) + if (canon != ti->ti_begin && (canon % TTYINQ_DATASIZE) == 0) tib = tib->tib_next; ti->ti_linestart = ti->ti_reprint = canon; ti->ti_startblock = ti->ti_reprintblock = tib; From nobody Wed Jan 24 19:56:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKvpk23g2z58d3S; Wed, 24 Jan 2024 19:56: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 4TKvpk1YNsz4HQ2; Wed, 24 Jan 2024 19:56:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706126174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E5wxZGzKaRY28H7W4sFrVsQQiryjhqs+Pc52HF445CA=; b=mYOJn40UIcVe19G6zyrThDudUOanh+GmVKTYIyvhbO0jOrjvhAkHIh7onaMuqz+Yf72Czh BTZDMP/zycJa2+IXJ79MxPwezDfiFga4N/5lFMlGB597/IxDnoudWDKq9rP3ev3gCbHcmJ HqPzJajegZX8mhkfRBH0xLNZ0+5MVpEvV4Ep5BhOW4eVK434bsEDq+LvIEsC6cjcuzrTTi auoYrQuKXaQTNp/6hMjHlUcqp8PDkqAShT9p6Zpol+6SqJLsex6fUAL/N3Oa6SD26tOrIy 1cPR4ykc4x4JyEnPrm8JJOX4HD/ucyDYMZn67uW7LHg1JQtbXkaRH8GBfvgeHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706126174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E5wxZGzKaRY28H7W4sFrVsQQiryjhqs+Pc52HF445CA=; b=av31rRHzGUdCAJz/yNRpG52bbs3KW3bh0i1maz+TcAznwrl4OwrnLUXWnrb9Z1hIK/UAN7 MzgGySeSs18CJC+Jrm5FKoVPRiZ0gL8XMzNTXanbbwSBp0Ze2u8+b1FIy4mz8aJ2pzPuJH hsc6ZAjgkzC6sluLJlRvdkqSFXbiN1GQtJQ23GibeE8iOe6CT4ZK1HRvenuFSS6vKyaSlo nwZYpUCBRVseu470vIrJC1iK3A8sz3yR8O96c3n1YTZfaNa1XzmfRuwhrNM5Rtel22qNgV 3Cul1/7YDA2zUsYSKTXW1PtrMoSnvV4WVtpyZxUSuOsuPP5xgPgbnASypz8QmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706126174; a=rsa-sha256; cv=none; b=d/X7MmRyZt0EV+zHggylsJrwAXnPQ4OElKogss2MsLP7J7TVB+vYTRdPk7ig8JA71CbRYH CWbvLijzzjXsuVjI3VRqg2fS6A0bx52CHEqUNkrE4Fmh4hMghHGddPI14NScTScg02gfI7 xegRcbRrwZIOcbrmwl7kc7ABN5dsMbd8kVlbBbxdZ/HtvPGdFUZmPP7d5THoSkHrUL2Wkt xCUEdxw7OdYApy+mC33faES1naNCZIg+CgCGZqd+4nLp9msq1LGzTMiYE4DfkO6ngs+YMR ruSQi/S61TkKQk+RPjyTnsc/KxkSPOpB0JIBb8w52JPjp7vxbAuoTq9vbWzQFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKvpk0cFLzSGk; Wed, 24 Jan 2024 19:56: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 40OJuDL1023571; Wed, 24 Jan 2024 19:56:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJuD8e023568; Wed, 24 Jan 2024 19:56:13 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:56:13 GMT Message-Id: <202401241956.40OJuD8e023568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 54d31cfb2789 - main - mount: document atime option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54d31cfb278982ff8c2af97a13e40b1a3ebd838e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=54d31cfb278982ff8c2af97a13e40b1a3ebd838e commit 54d31cfb278982ff8c2af97a13e40b1a3ebd838e Author: Ed Maste AuthorDate: 2024-01-24 16:26:23 +0000 Commit: Ed Maste CommitDate: 2024-01-24 19:55:54 +0000 mount: document atime option atime is enabled by default, but may be specified explicitly so that any future change in the default would not have an effect on a given mount. Reviewed by: olce, rgrimes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43580 --- sbin/mount/mount.8 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 883e0bb5caf0..e8e604ba4088 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 15, 2024 +.Dd January 24, 2024 .Dt MOUNT 8 .Os .Sh NAME @@ -155,6 +155,9 @@ For this reason, the .Cm async flag should be used sparingly, and only when some data recovery mechanism is present. +.It Cm atime +Update the file access time when reading from a file. +This is the default. .It Cm automounted This flag indicates that the file system was mounted by .Xr automountd 8 . From nobody Wed Jan 24 22:03:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKyfS4gmwz58pGF; Wed, 24 Jan 2024 22:04:16 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKyfS17Rsz4ZFL; Wed, 24 Jan 2024 22:04:16 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2906dffd8ddso3716491a91.3; Wed, 24 Jan 2024 14:04:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706133854; x=1706738654; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=kuXdNwfY7z6e4OVadjn0QTtO8oZYe0OiOgkVLtaaDE8=; b=LNKNWxty/KDJ5L+Bs9FJDkyFDn2tRWIFXWeGvHTtjd1kR6qDziaKEyjf/JwJO8RgIR u1TXrEPAgjsTXpyX/etKrvprune+l3AoMOosyHrHVDHxfT2P7yqtygxqL/c6T56So6Fd n8ux3+FwY2JqgXGna1rMhkN0BXgvhn/qbJ9TmerP6ey5QQ7oqYHxvZbhWiPD+XG4+dQD 8jYGL7rT0vJIQAPFQUEWLTGGZpSUL8IfrI8Mg8OjT8eCM6flZ69tj1lAtC9I4o4jyrGg eS0fkMjNn9s0Z2v1neb7S/Iz/XyCgTwms3LBAE+cKJnarlAo6yP1tR2aY7DUpkXD+AaE NWUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706133854; x=1706738654; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kuXdNwfY7z6e4OVadjn0QTtO8oZYe0OiOgkVLtaaDE8=; b=v3b33GJ5EH4vra+iuy0E9PP6HD6jV3Ko8Z7jbW5G6EnSp4QMP85mNNAfh+tAurc1MO gdcSP0ZhsXY5sRNjfBXAMxG/Gd80CGPxB5TZe3IC4jULCidCl3WK83rGcNlz5Lw6fv4W JApSIRo0h2RWOI+xTfp9vA+TSSX4mnYqeJks//NDv0kuGckBvKJcEncldXMS1Nj7bewa HvVXmyMqMDkiW+p811tNErCC42AhQKOnY28v9w5xSUirReEOTiOGxZN5EqBPMXVm4FLI 4UYlzjf8NpEULA0y8iloHZf1OQdqIyCTt3fqra3HXjbdAJh/CIt5d76OIPmvhggpcfq8 rUIQ== X-Gm-Message-State: AOJu0YxJV0IyHyFhNhcvXrwH090lf8KRIw1gNTmARibcLwQ5yaOX9bCB lU1gkGc4GMZZ7emUhIJwXMlpGBGXW6sRax8hGAHe5bMmDBR1gy9QoYhQPRcMZvWBWVUWqHjSib3 XfCrmP2oavDASXDNKwgCSArvqTmc0QBw= X-Google-Smtp-Source: AGHT+IFUmpyU92w7nf/FjJP7SbiJXcUh02+xKTwLd8V1kIzdd6eGCPWH/AOTkUsJVS14hd3ATbln1lHm+bFp5m05dHA= X-Received: by 2002:a17:90a:5895:b0:290:1f0c:b742 with SMTP id j21-20020a17090a589500b002901f0cb742mr24549pji.28.1706133853693; Wed, 24 Jan 2024 14:04:13 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202401241956.40OJuD8e023568@gitrepo.freebsd.org> In-Reply-To: <202401241956.40OJuD8e023568@gitrepo.freebsd.org> From: Rick Macklem Date: Wed, 24 Jan 2024 14:03:58 -0800 Message-ID: Subject: Re: git: 54d31cfb2789 - main - mount: document atime option To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4TKyfS17Rsz4ZFL X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] On Wed, Jan 24, 2024 at 11:56=E2=80=AFAM Ed Maste wrot= e: > > CAUTION: This email originated from outside of the University of Guelph. = Do not click links or open attachments unless you recognize the sender and = know the content is safe. If in doubt, forward suspicious emails to IThelp@= uoguelph.ca. > > > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D54d31cfb278982ff8c2af97a13= e40b1a3ebd838e > > commit 54d31cfb278982ff8c2af97a13e40b1a3ebd838e > Author: Ed Maste > AuthorDate: 2024-01-24 16:26:23 +0000 > Commit: Ed Maste > CommitDate: 2024-01-24 19:55:54 +0000 > > mount: document atime option > > atime is enabled by default, but may be specified explicitly so that = any > future change in the default would not have an effect on a given moun= t. > > Reviewed by: olce, rgrimes > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D43580 > --- > sbin/mount/mount.8 | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 > index 883e0bb5caf0..e8e604ba4088 100644 > --- a/sbin/mount/mount.8 > +++ b/sbin/mount/mount.8 > @@ -25,7 +25,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY = OF > .\" SUCH DAMAGE. > .\" > -.Dd January 15, 2024 > +.Dd January 24, 2024 > .Dt MOUNT 8 > .Os > .Sh NAME > @@ -155,6 +155,9 @@ For this reason, the > .Cm async > flag should be used sparingly, and only when some data recovery > mechanism is present. > +.It Cm atime > +Update the file access time when reading from a file. > +This is the default. I'll note that, for an NFS mount, atime is not implemented. I found out recently when Mike Karels asked. The NFS client does not do a Setattr/atime upon every read from the buffer cache. As such, the behaviour w.r.t. atime is largely undefined (and ahs been for decades) and depends on the NFS server's file system configuration. (I don't know if a "works for most file systems, but not NFS" is needed her= e? rick > .It Cm automounted > This flag indicates that the file system was mounted by > .Xr automountd 8 . From nobody Wed Jan 24 22:05:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKygg6BMkz58pR7; Wed, 24 Jan 2024 22:05: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 4TKygg5jGmz4ZdT; Wed, 24 Jan 2024 22:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706133919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Ts4dOqPvaV6MP7+28D0KPbdDB2eTPm+TlUtAIIfxu8=; b=Mz+IkVWMirQ5GmarpiEfl77Dm345udtUgKbesb70XB61kRcUYdsjuh3t1wDj5Eg1SCZPZK ETyNTftJvGGwqRCSpnYBIRFbXImGNDQKoeWjpv1sAIs3Yy7kY4VCEwCRFuB1gg71NcLUeg 0kjL9KrbxcCUYbrGeERVNNWUUqEecbfEWRzuiPi6inTbIYTDiTmtJKZb2KA1Nd+y3inSYu G/gzNrSFnprTn0skXq7+EMtQbf4zvWPU50fefEkPoWtvphECRDm8Nmsy+RkzTdNIv/d3Dq 0gxnwTyzWM59naUa1diJjRlrVgrdYQUZu0ZwpQ1n4fCWbNFfdFfNu2oNNOqP3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706133919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Ts4dOqPvaV6MP7+28D0KPbdDB2eTPm+TlUtAIIfxu8=; b=dPOD4yMYpBAFmsppFCxm2Qduvei7Xu3Pgf9eWbZXtZzXVE12iBfPDY16y6WC8JA2chBkPF bqWhU311kW5nBW/OmS3g0oIXJowHO+rLkJh41go79YjAKK3j7RfqYzlFwvnO+Y474HI5Vo dWHFyLzGQtc+KBi44EkF5ZYBuk2GxuJo+m4MWb+/05Fg6ZrNFQjfkYZltWKYoKpQkGxiEs nxCYeEFNf7JcEP0999shhKgTyXydHpe2BNxHwtzpqg7HV9xOVsNZhnlTdT0e5pyd/YMlHP F6eZEkmr9Pqqy3ohx76hpUegul4lBTXvBC+W3GzpgwSxInGuA4e8raxNs/xedA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706133919; a=rsa-sha256; cv=none; b=ZwQeBFGx1KtAmWbVPGdYb/89zs/OTpwoT6rfODMUgNAgYgy9IQnfDtMTl430hJ+jPk+26e 0zVCOZG0IRV36rx7Sq8x0q9hbzm0Z9/K+SStEJClf6udKV0Jkpii1N1rlCK09ySATwcG9l meilPlCpRlvUSVDFvfxq/QyuMbT6xpZ/FWNvzNlCG779TtMWoLqDfoXmbqJvVmGGep1GuY 4KJlCn8q9yotEiHzJtatCrrxNYx7wjULv1KfHMmU0oBaFBbK5sjxD2+iWPHBDAJz4pYVAa lQTtjnvq3um/MvBQB8PL4D+1d4TYo1qOvEhRBrM7IBGluSThP9i4dcj5A/TNKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKygg4nnvzXPf; Wed, 24 Jan 2024 22:05: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 40OM5Jnv042679; Wed, 24 Jan 2024 22:05:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OM5Jiq042676; Wed, 24 Jan 2024 22:05:19 GMT (envelope-from git) Date: Wed, 24 Jan 2024 22:05:19 GMT Message-Id: <202401242205.40OM5Jiq042676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 820401bf1769 - main - nl_types.h: explicitly include cdefs.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 820401bf176996e41091d2e4190aded12a966b1d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=820401bf176996e41091d2e4190aded12a966b1d commit 820401bf176996e41091d2e4190aded12a966b1d Author: Val Packett AuthorDate: 2024-01-16 18:42:26 +0000 Commit: Ed Maste CommitDate: 2024-01-24 21:59:18 +0000 nl_types.h: explicitly include cdefs.h This file uses __BEGIN_DECLS/__END_DECLS. When bootstrapping from Linux/musl, they were missing. Sponsored by: https://www.patreon.com/valpackett Pull Request: https://github.com/freebsd/freebsd-src/pull/1066 --- include/nl_types.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/nl_types.h b/include/nl_types.h index 120d1911631f..6ba15132126d 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -34,6 +34,7 @@ #ifndef _NL_TYPES_H_ #define _NL_TYPES_H_ +#include #include #ifdef _NLS_PRIVATE From nobody Wed Jan 24 23:06:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL01v6x8Gz58tJ7; Wed, 24 Jan 2024 23:06: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 4TL01v6PPLz4jCQ; Wed, 24 Jan 2024 23:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706137571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0yNr3YHHv+XF62l9mLf5qIR/7LRFdAr6VM/Whf22gDE=; b=q6NBx92uWyLfZQfiYdHwNfoRvh4bEApEIOLn+Rh1qA7vpUuvjMVxC+MLpdPX5kfObfYJsG MTgdRcTNgH+cF6Cy7Sdxu14BSopDGpHj+dOWUcM6ylD28gC+KDKqwkWFw4Wow6bcywRHuo DavgSo78mu/0BvML1pdaAesQPmc73+6AYe0Hk4udiAGtrDGO362KVn4k3kVyqWyFAbu2jY qO0i2JpD4BJOYoHClkWt3WkPuvbLpVjWGi9jgV+4WR7ltqTeIjP1l78twujLUhb+/sWB6D dYrHg0m5jyASfsW4/D73PuMJFOTocd8kSLgs4yO42W+gNr1Z0LLtvKaNVdLxug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706137571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0yNr3YHHv+XF62l9mLf5qIR/7LRFdAr6VM/Whf22gDE=; b=OuFx85hUk5y281jfOHJpyFU9wqcdktsZsJKgn+AF9NU3TvhnO8XLqHQs5ebD4oBeKNHzpF yj1iphz6FD4LW2UDXoDiEdfL8Rs2XJsHur0YVckG/0rKehgGVb2cCOg4tpQhaJG+ZXqCsL pdYl5RzXvVRmk+JAjYdUKdkTz0kzlUYoFeQt3x6v2QJPUjFkPe+OY04MB8oopphvolA+bE hHqmhY3+wKtJWOCg+YJGMODbZx7Wjpe3cOh4knkSge6M3QRwzMC/K4tbigvy2xTWIE0eUp LPofLFg82raO8uuQimSFZhRvknLUJ0zAtwCmzX6N8sU1WUEjkGs8SVyJtIqAuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706137571; a=rsa-sha256; cv=none; b=p6mV8TEFl3jWU/sQO6Qs2mMhqhzKfuqAjX7cJ1Eto4Nqz2VRmGM2K4SEchega3uFsQZyuV tgwhGAwmPMEZbg6QGwD92lMwvFSj+ni81wjybtof5VaI0D3ggVFoSUMAscf642wAUya+Zg Iwu+zcvT/jzTFHweNesfE4bLsRrTcCyESWDtC0dA2ZlR1zOUog3TZdEJ6s4/KuNi00csei 5rl6gcT9UrVoAfzxBA6p5l4ZXsejDfZMAXvKVGLxliOiAewRyjJz/PUk+hlLi9VrxCAhNF 7FoFi5Lb2xYdQhWNqIHyuIQLJ7xHHWnJr/1iXQvSiFpZMoAmcTfS7rSRglGkKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL01v5S1fzZKV; Wed, 24 Jan 2024 23:06: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 40ON6B3P042971; Wed, 24 Jan 2024 23:06:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ON6BZu042968; Wed, 24 Jan 2024 23:06:11 GMT (envelope-from git) Date: Wed, 24 Jan 2024 23:06:11 GMT Message-Id: <202401242306.40ON6BZu042968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d56ce5915c41 - main - mpsutil: Clean up libutil deps List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d56ce5915c41517ccc7de2510daec200e100ef68 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d56ce5915c41517ccc7de2510daec200e100ef68 commit d56ce5915c41517ccc7de2510daec200e100ef68 Author: Mark Johnston AuthorDate: 2024-01-24 19:47:56 +0000 Commit: Mark Johnston CommitDate: 2024-01-24 22:10:24 +0000 mpsutil: Clean up libutil deps mpsutil doesn't use libutil, so doesn't need to include libutil.h. See commit 76103694a051335bec1da318f9c6e3a676dc0145. No functional change intended. MFC after: 1 week --- usr.sbin/mpsutil/Makefile | 4 ---- usr.sbin/mpsutil/mps_debug.c | 1 - usr.sbin/mpsutil/mps_set.c | 1 - usr.sbin/mpsutil/mps_show.c | 1 - 4 files changed, 7 deletions(-) diff --git a/usr.sbin/mpsutil/Makefile b/usr.sbin/mpsutil/Makefile index a19c2f310167..aa59d8cddf76 100644 --- a/usr.sbin/mpsutil/Makefile +++ b/usr.sbin/mpsutil/Makefile @@ -1,17 +1,13 @@ - PROG= mpsutil SRCS= mps_cmd.c mps_debug.c mps_flash.c mps_set.c mps_show.c mps_slot.c mpsutil.c MAN= mpsutil.8 WARNS?= 3 -#LIBADD= cam util LINKS= ${BINDIR}/mpsutil ${BINDIR}/mprutil MLINKS= mpsutil.8 mprutil.8 CFLAGS+= -I${SRCTOP}/sys -I. -DUSE_MPT_IOCTLS -# Avoid dirdep dependency on libutil -CFLAGS+= -I${SRCTOP}/lib/libutil # Here be dragons .ifdef DEBUG diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c index c1eb57f7150d..68394de50143 100644 --- a/usr.sbin/mpsutil/mps_debug.c +++ b/usr.sbin/mpsutil/mps_debug.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/usr.sbin/mpsutil/mps_set.c b/usr.sbin/mpsutil/mps_set.c index 603c529b8696..a1b61356e4ec 100644 --- a/usr.sbin/mpsutil/mps_set.c +++ b/usr.sbin/mpsutil/mps_set.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index bbb2b22c8c73..378d5380aa76 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include From nobody Wed Jan 24 23:50:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL10r1RLZz58xWS; Wed, 24 Jan 2024 23:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TL10r0wxSz4ql2; Wed, 24 Jan 2024 23:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgtP6U1YTBXem3dr2K45qPhyD1n+HcKzIsyN+0jebj8=; b=WiNdB8bKZWkm1jTbqugp8Zo9gT7RNFPpWqQz5C7RUNcGV+gNtazBaFJcqgfR69YrhMarBX IMIVoHEOiDmExPe+LGjvYBxVSYWlBTKMQiKRRJJ/tZEpJvg7voxgaYMdWleJ9SQxTCDaYp XBLh7TaN7gN06QuR7LKDZyJAqcQCUYK6V3ndIPPj+utWD+hnMcO0cy4ujlUz/eKbxLhlT2 razTHFX3d67uAn1oU2n01WFVXKkTtSNSFPPcXsrz4NgXOv2RpmoDwS8GYAU+aIEYkpsrdi ZuYaqE5liAQ7rCiFs0wzjYzYfE5U81osEWcyV9xKQOw6JERHNBABh9gjwJPwdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgtP6U1YTBXem3dr2K45qPhyD1n+HcKzIsyN+0jebj8=; b=AtqL7natoFjm/AweGiJqBqAkgIiQVG2dYxUTN9ArSPAUBpwAh8be/29PjU7VkD8ScNXzxK irQ0fUdtCq773lET9BJrgq4ufz1GC4fqmM1npDTXD5sIxYm5Txnoix2np3AkW0IoBWv+9b aJeLBPu/mBrLMtIppDzK7+WVPNuxvTiDrmUOWaGIo9Inel1LYmvsnWECY5/FUxmwXGUDVP dGRxHVwq5ckeVj/cDPPAP6VZqVnkqEglBlGKHmf0+Hx4SCEzsWnc19PvT+x5+vUbF3OOBW 0qbJ+mpj698nwnwnGssMLH9RwreB7nUUy5phEs6cNlSL+66r9TYgTFq31VGWWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706140220; a=rsa-sha256; cv=none; b=WC5Wqw4K4cDakCFiCPQ9Q1O929W9bRyhy+35q+W8J5ZKX/G1VBG6WXiZov7QDjLq1tq5h9 nAm3/2qKSX/NdqHX1HjI9TJFbcfYUU7exE7hve4d0Bu3Dlo9pRxTpb/2VXR+agOL2uBp1y O6JWH6u6quX6nYxI74a70rxw1hfYxSvqv32yTzWzrFn5NdbbVVHPVqq1JJUIT/NymhOaxE XlUR8YPEkx5UUpB/AbzYoyffA/2Hc1FFzjxLNzHDVk1ONT/5Q+9pEuGn2DGEjvKwoHt066 e7L41VDmUb3rNLwRorImo7E75ol0YyZpz3SG/UBrE3P3Ajn8Xzrh0fuM24qwXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL10q75ZXzbHy; Wed, 24 Jan 2024 23:50: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 40ONoJBl018466; Wed, 24 Jan 2024 23:50:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ONoJf9018463; Wed, 24 Jan 2024 23:50:19 GMT (envelope-from git) Date: Wed, 24 Jan 2024 23:50:19 GMT Message-Id: <202401242350.40ONoJf9018463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: e06afdb28569 - main - intrng: Remove irq_root_ipicount and corresponding intr_pic_claim_root arg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e06afdb2856944d6db4e33d4bbe0e2dbbd057eb4 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e06afdb2856944d6db4e33d4bbe0e2dbbd057eb4 commit e06afdb2856944d6db4e33d4bbe0e2dbbd057eb4 Author: Jessica Clarke AuthorDate: 2024-01-24 23:49:53 +0000 Commit: Jessica Clarke CommitDate: 2024-01-24 23:49:53 +0000 intrng: Remove irq_root_ipicount and corresponding intr_pic_claim_root arg The static irq_root_ipicount variable is only ever written to (with the value passed to irq_root_ipicount), never read. Moreover, the bcm2836 driver, as used by the Raspberry Pi 2B and 3A/B (but not 4, which uses a GIC-400, though does have the legacy interrupt controller present too) passes 0 as ipicount, despite implementing IPIs. It's thus inaccurate and serves no purpose, so should be removed. Reviewed by: mmel, imp, mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D35897 --- sys/arm/allwinner/a10/a10_intc.c | 2 +- sys/arm/arm/gic_acpi.c | 3 +-- sys/arm/arm/gic_fdt.c | 3 +-- sys/arm/broadcom/bcm2835/bcm2835_intr.c | 2 +- sys/arm/broadcom/bcm2835/bcm2836.c | 2 +- sys/arm/ti/aintc.c | 2 +- sys/arm64/arm64/gic_v3_acpi.c | 4 ++-- sys/arm64/arm64/gic_v3_fdt.c | 3 +-- sys/kern/subr_intr.c | 4 +--- sys/riscv/riscv/plic.c | 2 +- sys/sys/intr.h | 2 +- 11 files changed, 12 insertions(+), 17 deletions(-) diff --git a/sys/arm/allwinner/a10/a10_intc.c b/sys/arm/allwinner/a10/a10_intc.c index 22b29ececac5..410fba4b4728 100644 --- a/sys/arm/allwinner/a10/a10_intc.c +++ b/sys/arm/allwinner/a10/a10_intc.c @@ -236,7 +236,7 @@ a10_intr_pic_attach(struct a10_aintc_softc *sc) if (pic == NULL) return (ENXIO); - return (intr_pic_claim_root(sc->sc_dev, xref, a10_intr, sc, 0)); + return (intr_pic_claim_root(sc->sc_dev, xref, a10_intr, sc)); } static void diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c index 22d8c9f06349..cdd2fc72a224 100644 --- a/sys/arm/arm/gic_acpi.c +++ b/sys/arm/arm/gic_acpi.c @@ -227,8 +227,7 @@ gic_acpi_attach(device_t dev) /* * Controller is root: */ - if (intr_pic_claim_root(dev, xref, arm_gic_intr, sc, - GIC_LAST_SGI - GIC_FIRST_SGI + 1) != 0) { + if (intr_pic_claim_root(dev, xref, arm_gic_intr, sc) != 0) { device_printf(dev, "could not set PIC as a root\n"); intr_pic_deregister(dev, xref); goto cleanup; diff --git a/sys/arm/arm/gic_fdt.c b/sys/arm/arm/gic_fdt.c index f59c9ad79640..c51522b0d58c 100644 --- a/sys/arm/arm/gic_fdt.c +++ b/sys/arm/arm/gic_fdt.c @@ -153,8 +153,7 @@ gic_fdt_attach(device_t dev) */ pxref = ofw_bus_find_iparent(ofw_bus_get_node(dev)); if (pxref == 0 || xref == pxref) { - if (intr_pic_claim_root(dev, xref, arm_gic_intr, sc, - GIC_LAST_SGI - GIC_FIRST_SGI + 1) != 0) { + if (intr_pic_claim_root(dev, xref, arm_gic_intr, sc) != 0) { device_printf(dev, "could not set PIC as a root\n"); intr_pic_deregister(dev, xref); goto cleanup; diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c index b49c9041810d..5a8457bc4b67 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c @@ -405,7 +405,7 @@ bcm_intc_attach(device_t dev) sc->intc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (sc->intc_irq_res == NULL) { - if (intr_pic_claim_root(dev, xref, bcm2835_intc_intr, sc, 0) != 0) { + if (intr_pic_claim_root(dev, xref, bcm2835_intc_intr, sc) != 0) { /* XXX clean up */ device_printf(dev, "could not set PIC as a root\n"); return (ENXIO); diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c index 60734abb40e3..f72bd9075982 100644 --- a/sys/arm/broadcom/bcm2835/bcm2836.c +++ b/sys/arm/broadcom/bcm2835/bcm2836.c @@ -646,7 +646,7 @@ bcm_lintc_pic_attach(struct bcm_lintc_softc *sc) if (pic == NULL) return (ENXIO); - return (intr_pic_claim_root(sc->bls_dev, xref, bcm_lintc_intr, sc, 0)); + return (intr_pic_claim_root(sc->bls_dev, xref, bcm_lintc_intr, sc)); } static int diff --git a/sys/arm/ti/aintc.c b/sys/arm/ti/aintc.c index ce986b2d38bc..776d231c3c48 100644 --- a/sys/arm/ti/aintc.c +++ b/sys/arm/ti/aintc.c @@ -230,7 +230,7 @@ ti_aintc_pic_attach(struct ti_aintc_softc *sc) if (pic == NULL) return (ENXIO); - return (intr_pic_claim_root(sc->sc_dev, xref, ti_aintc_intr, sc, 0)); + return (intr_pic_claim_root(sc->sc_dev, xref, ti_aintc_intr, sc)); } static int diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c index 3dff49f6214f..e55aea86157e 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -345,8 +345,8 @@ gic_v3_acpi_attach(device_t dev) } } - if (intr_pic_claim_root(dev, ACPI_INTR_XREF, arm_gic_v3_intr, sc, - GIC_LAST_SGI - GIC_FIRST_SGI + 1) != 0) { + if (intr_pic_claim_root(dev, ACPI_INTR_XREF, arm_gic_v3_intr, sc) + != 0) { err = ENXIO; goto error; } diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c index e48e7b36a649..8adb0497771e 100644 --- a/sys/arm64/arm64/gic_v3_fdt.c +++ b/sys/arm64/arm64/gic_v3_fdt.c @@ -161,8 +161,7 @@ gic_v3_fdt_attach(device_t dev) /* Register xref */ OF_device_register_xref(xref, dev); - if (intr_pic_claim_root(dev, xref, arm_gic_v3_intr, sc, - GIC_LAST_SGI - GIC_FIRST_SGI + 1) != 0) { + if (intr_pic_claim_root(dev, xref, arm_gic_v3_intr, sc) != 0) { err = ENXIO; goto error; } diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index 49fe20cdc890..fb75b2e1773b 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -100,7 +100,6 @@ void intr_irq_handler(struct trapframe *tf); device_t intr_irq_root_dev; static intr_irq_filter_t *irq_root_filter; static void *irq_root_arg; -static u_int irq_root_ipicount; struct intr_pic_child { SLIST_ENTRY(intr_pic_child) pc_next; @@ -884,7 +883,7 @@ intr_pic_deregister(device_t dev, intptr_t xref) */ int intr_pic_claim_root(device_t dev, intptr_t xref, intr_irq_filter_t *filter, - void *arg, u_int ipicount) + void *arg) { struct intr_pic *pic; @@ -916,7 +915,6 @@ intr_pic_claim_root(device_t dev, intptr_t xref, intr_irq_filter_t *filter, intr_irq_root_dev = dev; irq_root_filter = filter; irq_root_arg = arg; - irq_root_ipicount = ipicount; debugf("irq root set to %s\n", device_get_nameunit(dev)); return (0); diff --git a/sys/riscv/riscv/plic.c b/sys/riscv/riscv/plic.c index 90f79cf9b3aa..1e8a03127038 100644 --- a/sys/riscv/riscv/plic.c +++ b/sys/riscv/riscv/plic.c @@ -368,7 +368,7 @@ plic_attach(device_t dev) csr_set(sie, SIE_SEIE); - return (intr_pic_claim_root(sc->dev, xref, plic_intr, sc, 0)); + return (intr_pic_claim_root(sc->dev, xref, plic_intr, sc)); } static void diff --git a/sys/sys/intr.h b/sys/sys/intr.h index e91a661673d0..bdc693e6cb60 100644 --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -110,7 +110,7 @@ u_int intr_irq_next_cpu(u_int current_cpu, cpuset_t *cpumask); struct intr_pic *intr_pic_register(device_t, intptr_t); int intr_pic_deregister(device_t, intptr_t); -int intr_pic_claim_root(device_t, intptr_t, intr_irq_filter_t *, void *, u_int); +int intr_pic_claim_root(device_t, intptr_t, intr_irq_filter_t *, void *); int intr_pic_add_handler(device_t, struct intr_pic *, intr_child_irq_filter_t *, void *, uintptr_t, uintptr_t); bool intr_is_per_cpu(struct resource *); From nobody Wed Jan 24 23:50:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL10s3BmWz58xnB; Wed, 24 Jan 2024 23:50: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 4TL10s1GqPz4qhb; Wed, 24 Jan 2024 23:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/MuS/+AvvFNN7QMOZoX7r0MyZoDK1Q0RP89K4DI7OU=; b=T1y0Ze0wKxO0gbEUwY95FFARbVnvYrPHjXWbjgAVex/6WD0sIRlDn53mxElhtG+Zr5ncmL Cen9giWhSrQpJ0KIYgszm46Qpw+IVBmgBvAXcF/z3euD1tmWGRzRgqHMKfvsaucGDC78gB /TKclgXByS3YO74YwQrBf2MqVTdwklE+9QpignjFfE3nUzk7jTe2vNaq1Ry0LkFoo8iIJd UfHrFoDE0h7616+GFvagEaVQrk+rfsR/CaV1Evw0Ql4Iacf2HtgTLEUGessWv90OkJ4CxP Vlpx7qq5Nus+TkmSENlERPjOxFmhuLjKEdRdyvn6BZSwBiUIUNSwq0xlZ0gtAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/MuS/+AvvFNN7QMOZoX7r0MyZoDK1Q0RP89K4DI7OU=; b=bU8k0fGOjR7pY19f2biHnWHzOvF48f+XhSplzPaavShr7a49TAD/+DPjXml0H7x3A5mdiO OArrYZovrPc1iNRi3znlka+RaIkabKgr0qz3XxIpQIoBlHcxsPZXkHTulDTT8ZPwNYM2Bp yNre7YRzxrQgpOokIdKWGJK32OWa0Y/KAIWxoYHPyxaKHBOyo+DJZq3ISzQUe/AsvHMLk/ +nQ1CXdOBCymnIbcSQSjempXHL2mDqJpeFiltwF6g4zhz1NJVF1tsir+avTApxw+aGairk AShy7lhdRIEmK6MrATcE6lEFR2CWIs71NpidkcCy9CorO4AZPZtn69UHPz0r+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706140221; a=rsa-sha256; cv=none; b=Y+1HzE2r6MhzoD2QXRw6Qspn6KpGLk1ef2LIHnzCBaK3v0zgGhQmTlImakql5Za9NcGWML 1DKWNTVUnRyFCyLAQ58JOuhSk8Vw/CmbUGs0IVgeaVl16S4nNdiS5+UK0/J7XqxRGxXgjW TP7vkn0zLiwYMv+PSHdazrlkpq0s8RIxfkk/UZ6+LjySiQbnJBCYvgBIab4QBE047R88/J 55xKQzZ6Uv+zGCRbwkkNgCAnZUc+EGvSWvRNpMGfP5bOarTMc2yeRfIA+7hAE4e6n9mcv+ ulzw2gTfHhf/oQqhVry1b/Tt0mq6Nia4iM9nFhFMHx4aR+z8dw/qPBt27cBOww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL10s0McczbNd; Wed, 24 Jan 2024 23:50: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 40ONoLBL018524; Wed, 24 Jan 2024 23:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ONoKsU018521; Wed, 24 Jan 2024 23:50:20 GMT (envelope-from git) Date: Wed, 24 Jan 2024 23:50:20 GMT Message-Id: <202401242350.40ONoKsU018521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: fae8755f16ff - main - intrng: Extract arm/arm64 IPI->PIC glue code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fae8755f16ff5b9bdc32df046e0f16c0cbb48a29 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=fae8755f16ff5b9bdc32df046e0f16c0cbb48a29 commit fae8755f16ff5b9bdc32df046e0f16c0cbb48a29 Author: Jessica Clarke AuthorDate: 2024-01-24 23:49:53 +0000 Commit: Jessica Clarke CommitDate: 2024-01-24 23:49:53 +0000 intrng: Extract arm/arm64 IPI->PIC glue code The arm and arm64 implementations of dispatching IPIs via PIC_IPI_SEND are almost identical, and entirely MI with the lone exception of a single store barrier on arm64 (that is likely either redundant or needed on arm too). Thus, de-duplicate this code by moving it to INTRNG as a generic IPI glue framework. The ipi_* functions remain declared in MD smp.h headers and implemented in MD code, but are trivial wrappers around intr_ipi_send that could be made MI, at least for INTRNG ports, at a later date. Note that, whilst both arm and arm64 had an ii_send member in intr_ipi to abstract over how to send interrupts,, they were always ultimately using PIC_IPI_SEND, and so this complexity has been removed. A follow-up commit will re-introduce the same flexibility by instead allowing a device other than the root PIC to be registered as the IPI sender. As part of this, strengthen a MAXCPU assertion that was missed in commit 2f0b059eeafc ("intrng: switch from MAXCPU to mp_ncpus") (which itself is mis-titled). Reviewed by: mmel, mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D35898 --- sys/arm/arm/machdep_intr.c | 126 +------------------------- sys/arm/arm/mp_machdep.c | 10 +-- sys/arm/include/intr.h | 13 --- sys/arm64/arm64/mp_machdep.c | 204 ++----------------------------------------- sys/arm64/include/intr.h | 4 - sys/kern/subr_intr.c | 188 ++++++++++++++++++++++++++++++++------- sys/sys/intr.h | 21 ++--- 7 files changed, 177 insertions(+), 389 deletions(-) diff --git a/sys/arm/arm/machdep_intr.c b/sys/arm/arm/machdep_intr.c index fc16741a49fa..712336e7c048 100644 --- a/sys/arm/arm/machdep_intr.c +++ b/sys/arm/arm/machdep_intr.c @@ -29,39 +29,10 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include - -#include "pic_if.h" - -#ifdef SMP -#define INTR_IPI_NAMELEN (MAXCOMLEN + 1) - -struct intr_ipi { - intr_ipi_handler_t * ii_handler; - void * ii_handler_arg; - intr_ipi_send_t * ii_send; - void * ii_send_arg; - char ii_name[INTR_IPI_NAMELEN]; - u_long * ii_count; -}; - -static struct intr_ipi ipi_sources[INTR_IPI_COUNT]; -#endif +#include +#include /* * arm_irq_memory_barrier() @@ -125,96 +96,3 @@ arm_irq_memory_barrier(uintptr_t irq) dsb(); cpu_l2cache_drain_writebuf(); } - -#ifdef SMP -static inline struct intr_ipi * -intr_ipi_lookup(u_int ipi) -{ - - if (ipi >= INTR_IPI_COUNT) - panic("%s: no such IPI %u", __func__, ipi); - - return (&ipi_sources[ipi]); -} - -void -intr_ipi_dispatch(u_int ipi) -{ - struct intr_ipi *ii; - - ii = intr_ipi_lookup(ipi); - if (ii->ii_count == NULL) - panic("%s: not setup IPI %u", __func__, ipi); - - intr_ipi_increment_count(ii->ii_count, PCPU_GET(cpuid)); - - ii->ii_handler(ii->ii_handler_arg); -} - -void -intr_ipi_send(cpuset_t cpus, u_int ipi) -{ - struct intr_ipi *ii; - - ii = intr_ipi_lookup(ipi); - if (ii->ii_count == NULL) - panic("%s: not setup IPI %u", __func__, ipi); - - ii->ii_send(ii->ii_send_arg, cpus, ipi); -} - -void -intr_ipi_setup(u_int ipi, const char *name, intr_ipi_handler_t *hand, - void *h_arg, intr_ipi_send_t *send, void *s_arg) -{ - struct intr_ipi *ii; - - ii = intr_ipi_lookup(ipi); - - KASSERT(hand != NULL, ("%s: ipi %u no handler", __func__, ipi)); - KASSERT(send != NULL, ("%s: ipi %u no sender", __func__, ipi)); - KASSERT(ii->ii_count == NULL, ("%s: ipi %u reused", __func__, ipi)); - - ii->ii_handler = hand; - ii->ii_handler_arg = h_arg; - ii->ii_send = send; - ii->ii_send_arg = s_arg; - strlcpy(ii->ii_name, name, INTR_IPI_NAMELEN); - ii->ii_count = intr_ipi_setup_counters(name); -} - -/* - * Send IPI thru interrupt controller. - */ -static void -pic_ipi_send(void *arg, cpuset_t cpus, u_int ipi) -{ - - KASSERT(intr_irq_root_dev != NULL, ("%s: no root attached", __func__)); - PIC_IPI_SEND(intr_irq_root_dev, arg, cpus, ipi); -} - -/* - * Setup IPI handler on interrupt controller. - * - * Not SMP coherent. - */ -int -intr_pic_ipi_setup(u_int ipi, const char *name, intr_ipi_handler_t *hand, - void *arg) -{ - int error; - struct intr_irqsrc *isrc; - - KASSERT(intr_irq_root_dev != NULL, ("%s: no root attached", __func__)); - - error = PIC_IPI_SETUP(intr_irq_root_dev, ipi, &isrc); - if (error != 0) - return (error); - - isrc->isrc_handlers++; - intr_ipi_setup(ipi, name, hand, arg, pic_ipi_send, isrc); - PIC_ENABLE_INTR(intr_irq_root_dev, isrc); - return (0); -} -#endif diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c index 0d78ef789d6e..01b02d9520ca 100644 --- a/sys/arm/arm/mp_machdep.c +++ b/sys/arm/arm/mp_machdep.c @@ -300,11 +300,11 @@ release_aps(void *dummy __unused) if (mp_ncpus == 1) return; - intr_pic_ipi_setup(IPI_RENDEZVOUS, "rendezvous", ipi_rendezvous, NULL); - intr_pic_ipi_setup(IPI_AST, "ast", ipi_ast, NULL); - intr_pic_ipi_setup(IPI_STOP, "stop", ipi_stop, NULL); - intr_pic_ipi_setup(IPI_PREEMPT, "preempt", ipi_preempt, NULL); - intr_pic_ipi_setup(IPI_HARDCLOCK, "hardclock", ipi_hardclock, NULL); + intr_ipi_setup(IPI_RENDEZVOUS, "rendezvous", ipi_rendezvous, NULL); + intr_ipi_setup(IPI_AST, "ast", ipi_ast, NULL); + intr_ipi_setup(IPI_STOP, "stop", ipi_stop, NULL); + intr_ipi_setup(IPI_PREEMPT, "preempt", ipi_preempt, NULL); + intr_ipi_setup(IPI_HARDCLOCK, "hardclock", ipi_hardclock, NULL); atomic_store_rel_int(&aps_ready, 1); /* Wake the other threads up */ diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h index 21829c5782bc..d0d0ff9fc32a 100644 --- a/sys/arm/include/intr.h +++ b/sys/arm/include/intr.h @@ -49,19 +49,6 @@ #include -#ifdef SMP -typedef void intr_ipi_send_t(void *, cpuset_t, u_int); -typedef void intr_ipi_handler_t(void *); - -void intr_ipi_dispatch(u_int); -void intr_ipi_send(cpuset_t, u_int); - -void intr_ipi_setup(u_int, const char *, intr_ipi_handler_t *, void *, - intr_ipi_send_t *, void *); - -int intr_pic_ipi_setup(u_int, const char *, intr_ipi_handler_t *, void *); -#endif - void arm_irq_memory_barrier(uintptr_t); #endif /* _MACHINE_INTR_H */ diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index c2b30930fd91..9c6175445572 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -77,8 +77,6 @@ #include -#include "pic_if.h" - #define MP_BOOTSTACK_SIZE (kstack_pages * PAGE_SIZE) #define MP_QUIRK_CPULIST 0x01 /* The list of cpus may be wrong, */ @@ -98,25 +96,6 @@ static struct { }; #endif -typedef void intr_ipi_send_t(void *, cpuset_t, u_int); -typedef void intr_ipi_handler_t(void *); - -#define INTR_IPI_NAMELEN (MAXCOMLEN + 1) -struct intr_ipi { - intr_ipi_handler_t * ii_handler; - void * ii_handler_arg; - intr_ipi_send_t * ii_send; - void * ii_send_arg; - char ii_name[INTR_IPI_NAMELEN]; - u_long * ii_count; -}; - -static struct intr_ipi ipi_sources[INTR_IPI_COUNT]; - -static struct intr_ipi *intr_ipi_lookup(u_int); -static void intr_pic_ipi_setup(u_int, const char *, intr_ipi_handler_t *, - void *); - static void ipi_ast(void *); static void ipi_hardclock(void *); static void ipi_preempt(void *); @@ -165,12 +144,12 @@ release_aps(void *dummy __unused) if (mp_ncpus == 1) return; - intr_pic_ipi_setup(IPI_AST, "ast", ipi_ast, NULL); - intr_pic_ipi_setup(IPI_PREEMPT, "preempt", ipi_preempt, NULL); - intr_pic_ipi_setup(IPI_RENDEZVOUS, "rendezvous", ipi_rendezvous, NULL); - intr_pic_ipi_setup(IPI_STOP, "stop", ipi_stop, NULL); - intr_pic_ipi_setup(IPI_STOP_HARD, "stop hard", ipi_stop, NULL); - intr_pic_ipi_setup(IPI_HARDCLOCK, "hardclock", ipi_hardclock, NULL); + intr_ipi_setup(IPI_AST, "ast", ipi_ast, NULL); + intr_ipi_setup(IPI_PREEMPT, "preempt", ipi_preempt, NULL); + intr_ipi_setup(IPI_RENDEZVOUS, "rendezvous", ipi_rendezvous, NULL); + intr_ipi_setup(IPI_STOP, "stop", ipi_stop, NULL); + intr_ipi_setup(IPI_STOP_HARD, "stop hard", ipi_stop, NULL); + intr_ipi_setup(IPI_HARDCLOCK, "hardclock", ipi_hardclock, NULL); atomic_store_rel_int(&aps_ready, 1); /* Wake up the other CPUs */ @@ -315,71 +294,6 @@ smp_after_idle_runnable(void *arg __unused) SYSINIT(smp_after_idle_runnable, SI_SUB_SMP, SI_ORDER_ANY, smp_after_idle_runnable, NULL); -/* - * Send IPI thru interrupt controller. - */ -static void -pic_ipi_send(void *arg, cpuset_t cpus, u_int ipi) -{ - - KASSERT(intr_irq_root_dev != NULL, ("%s: no root attached", __func__)); - - /* - * Ensure that this CPU's stores will be visible to IPI - * recipients before starting to send the interrupts. - */ - dsb(ishst); - - PIC_IPI_SEND(intr_irq_root_dev, arg, cpus, ipi); -} - -/* - * Setup IPI handler on interrupt controller. - * - * Not SMP coherent. - */ -static void -intr_pic_ipi_setup(u_int ipi, const char *name, intr_ipi_handler_t *hand, - void *arg) -{ - struct intr_irqsrc *isrc; - struct intr_ipi *ii; - int error; - - KASSERT(intr_irq_root_dev != NULL, ("%s: no root attached", __func__)); - KASSERT(hand != NULL, ("%s: ipi %u no handler", __func__, ipi)); - - error = PIC_IPI_SETUP(intr_irq_root_dev, ipi, &isrc); - if (error != 0) - return; - - isrc->isrc_handlers++; - - ii = intr_ipi_lookup(ipi); - KASSERT(ii->ii_count == NULL, ("%s: ipi %u reused", __func__, ipi)); - - ii->ii_handler = hand; - ii->ii_handler_arg = arg; - ii->ii_send = pic_ipi_send; - ii->ii_send_arg = isrc; - strlcpy(ii->ii_name, name, INTR_IPI_NAMELEN); - ii->ii_count = intr_ipi_setup_counters(name); - - PIC_ENABLE_INTR(intr_irq_root_dev, isrc); -} - -static void -intr_ipi_send(cpuset_t cpus, u_int ipi) -{ - struct intr_ipi *ii; - - ii = intr_ipi_lookup(ipi); - if (ii->ii_count == NULL) - panic("%s: not setup IPI %u", __func__, ipi); - - ii->ii_send(ii->ii_send_arg, cpus, ipi); -} - static void ipi_ast(void *dummy __unused) { @@ -888,112 +802,6 @@ cpu_mp_setmaxid(void) } } -/* - * Lookup IPI source. - */ -static struct intr_ipi * -intr_ipi_lookup(u_int ipi) -{ - - if (ipi >= INTR_IPI_COUNT) - panic("%s: no such IPI %u", __func__, ipi); - - return (&ipi_sources[ipi]); -} - -/* - * interrupt controller dispatch function for IPIs. It should - * be called straight from the interrupt controller, when associated - * interrupt source is learned. Or from anybody who has an interrupt - * source mapped. - */ -void -intr_ipi_dispatch(u_int ipi) -{ - struct intr_ipi *ii; - - ii = intr_ipi_lookup(ipi); - if (ii->ii_count == NULL) - panic("%s: not setup IPI %u", __func__, ipi); - - intr_ipi_increment_count(ii->ii_count, PCPU_GET(cpuid)); - - ii->ii_handler(ii->ii_handler_arg); -} - -#ifdef notyet -/* - * Map IPI into interrupt controller. - * - * Not SMP coherent. - */ -static int -ipi_map(struct intr_irqsrc *isrc, u_int ipi) -{ - boolean_t is_percpu; - int error; - - if (ipi >= INTR_IPI_COUNT) - panic("%s: no such IPI %u", __func__, ipi); - - KASSERT(intr_irq_root_dev != NULL, ("%s: no root attached", __func__)); - - isrc->isrc_type = INTR_ISRCT_NAMESPACE; - isrc->isrc_nspc_type = INTR_IRQ_NSPC_IPI; - isrc->isrc_nspc_num = ipi_next_num; - - error = PIC_REGISTER(intr_irq_root_dev, isrc, &is_percpu); - if (error == 0) { - isrc->isrc_dev = intr_irq_root_dev; - ipi_next_num++; - } - return (error); -} - -/* - * Setup IPI handler to interrupt source. - * - * Note that there could be more ways how to send and receive IPIs - * on a platform like fast interrupts for example. In that case, - * one can call this function with ASIF_NOALLOC flag set and then - * call intr_ipi_dispatch() when appropriate. - * - * Not SMP coherent. - */ -int -intr_ipi_set_handler(u_int ipi, const char *name, intr_ipi_filter_t *filter, - void *arg, u_int flags) -{ - struct intr_irqsrc *isrc; - int error; - - if (filter == NULL) - return(EINVAL); - - isrc = intr_ipi_lookup(ipi); - if (isrc->isrc_ipifilter != NULL) - return (EEXIST); - - if ((flags & AISHF_NOALLOC) == 0) { - error = ipi_map(isrc, ipi); - if (error != 0) - return (error); - } - - isrc->isrc_ipifilter = filter; - isrc->isrc_arg = arg; - isrc->isrc_handlers = 1; - isrc->isrc_count = intr_ipi_setup_counters(name); - isrc->isrc_index = 0; /* it should not be used in IPI case */ - - if (isrc->isrc_dev != NULL) { - PIC_ENABLE_INTR(isrc->isrc_dev, isrc); - PIC_ENABLE_SOURCE(isrc->isrc_dev, isrc); - } - return (0); -} -#endif - /* Sending IPI */ void ipi_all_but_self(u_int ipi) diff --git a/sys/arm64/include/intr.h b/sys/arm64/include/intr.h index 8d9c35e81cd7..3cdbc83ff109 100644 --- a/sys/arm64/include/intr.h +++ b/sys/arm64/include/intr.h @@ -42,10 +42,6 @@ arm_irq_memory_barrier(uintptr_t irq) { } -#ifdef SMP -void intr_ipi_dispatch(u_int); -#endif - #ifdef DEV_ACPI #define ACPI_INTR_XREF 1 #define ACPI_MSI_XREF 2 diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index fb75b2e1773b..c89f12a30ec9 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -2,6 +2,11 @@ * Copyright (c) 2015-2016 Svatopluk Kraus * Copyright (c) 2015-2016 Michal Meloun * All rights reserved. + * Copyright (c) 2015-2016 The FreeBSD Foundation + * Copyright (c) 2021 Jessica Clarke + * + * Portions of this software were developed by Andrew Turner under + * sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -124,6 +129,18 @@ struct intr_pic { SLIST_HEAD(, intr_pic_child) pic_children; }; +#ifdef SMP +#define INTR_IPI_NAMELEN (MAXCOMLEN + 1) + +struct intr_ipi { + intr_ipi_handler_t *ii_handler; + void *ii_handler_arg; + struct intr_irqsrc *ii_isrc; + char ii_name[INTR_IPI_NAMELEN]; + u_long *ii_count; +}; +#endif + static struct mtx pic_list_lock; static SLIST_HEAD(, intr_pic) pic_list; @@ -140,6 +157,8 @@ static bool irq_assign_cpu = true; #else static bool irq_assign_cpu = false; #endif + +static struct intr_ipi ipi_sources[INTR_IPI_COUNT]; #endif u_int intr_nirq = NIRQ; @@ -298,39 +317,6 @@ isrc_release_counters(struct intr_irqsrc *isrc) bit_nclear(intrcnt_bitmap, idx, idx + 1); } -#ifdef SMP -/* - * Virtualization for interrupt source IPI counters setup. - */ -u_long * -intr_ipi_setup_counters(const char *name) -{ - u_int index, i; - char str[INTRNAME_LEN]; - - mtx_lock(&isrc_table_lock); - - /* - * We should never have a problem finding mp_maxid + 1 contiguous - * counters, in practice. Interrupts will be allocated sequentially - * during boot, so the array should fill from low to high index. Once - * reserved, the IPI counters will never be released. Similarly, we - * will not need to allocate more IPIs once the system is running. - */ - bit_ffc_area(intrcnt_bitmap, nintrcnt, mp_maxid + 1, &index); - if (index == -1) - panic("Failed to allocate %d counters. Array exhausted?", - mp_maxid + 1); - bit_nset(intrcnt_bitmap, index, index + mp_maxid); - for (i = 0; i < mp_maxid + 1; i++) { - snprintf(str, INTRNAME_LEN, "cpu%d:%s", i, name); - intrcnt_setname(str, index + i); - } - mtx_unlock(&isrc_table_lock); - return (&intrcnt[index]); -} -#endif - /* * Main interrupt dispatch handler. It's called straight * from the assembler, where CPU interrupt is served. @@ -1774,3 +1760,139 @@ intr_map_init(void *dummy __unused) M_INTRNG, M_WAITOK | M_ZERO); } SYSINIT(intr_map_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_map_init, NULL); + +#ifdef SMP +/* Virtualization for interrupt source IPI counter increment. */ +static inline void +intr_ipi_increment_count(u_long *counter, u_int cpu) +{ + + KASSERT(cpu < mp_maxid + 1, ("%s: too big cpu %u", __func__, cpu)); + counter[cpu]++; +} + +/* + * Virtualization for interrupt source IPI counters setup. + */ +static u_long * +intr_ipi_setup_counters(const char *name) +{ + u_int index, i; + char str[INTRNAME_LEN]; + + mtx_lock(&isrc_table_lock); + + /* + * We should never have a problem finding mp_maxid + 1 contiguous + * counters, in practice. Interrupts will be allocated sequentially + * during boot, so the array should fill from low to high index. Once + * reserved, the IPI counters will never be released. Similarly, we + * will not need to allocate more IPIs once the system is running. + */ + bit_ffc_area(intrcnt_bitmap, nintrcnt, mp_maxid + 1, &index); + if (index == -1) + panic("Failed to allocate %d counters. Array exhausted?", + mp_maxid + 1); + bit_nset(intrcnt_bitmap, index, index + mp_maxid); + for (i = 0; i < mp_maxid + 1; i++) { + snprintf(str, INTRNAME_LEN, "cpu%d:%s", i, name); + intrcnt_setname(str, index + i); + } + mtx_unlock(&isrc_table_lock); + return (&intrcnt[index]); +} + +/* + * Lookup IPI source. + */ +static struct intr_ipi * +intr_ipi_lookup(u_int ipi) +{ + + if (ipi >= INTR_IPI_COUNT) + panic("%s: no such IPI %u", __func__, ipi); + + return (&ipi_sources[ipi]); +} + +/* + * Setup IPI handler on interrupt controller. + * + * Not SMP coherent. + */ +void +intr_ipi_setup(u_int ipi, const char *name, intr_ipi_handler_t *hand, + void *arg) +{ + struct intr_irqsrc *isrc; + struct intr_ipi *ii; + int error; + + KASSERT(intr_irq_root_dev != NULL, ("%s: no root attached", __func__)); + KASSERT(hand != NULL, ("%s: ipi %u no handler", __func__, ipi)); + + error = PIC_IPI_SETUP(intr_irq_root_dev, ipi, &isrc); + if (error != 0) + return; + + isrc->isrc_handlers++; + + ii = intr_ipi_lookup(ipi); + KASSERT(ii->ii_count == NULL, ("%s: ipi %u reused", __func__, ipi)); + + ii->ii_handler = hand; + ii->ii_handler_arg = arg; + ii->ii_isrc = isrc; + strlcpy(ii->ii_name, name, INTR_IPI_NAMELEN); + ii->ii_count = intr_ipi_setup_counters(name); + + PIC_ENABLE_INTR(intr_irq_root_dev, isrc); +} + +void +intr_ipi_send(cpuset_t cpus, u_int ipi) +{ + struct intr_ipi *ii; + + KASSERT(intr_irq_root_dev != NULL, ("%s: no root attached", __func__)); + + ii = intr_ipi_lookup(ipi); + if (ii->ii_count == NULL) + panic("%s: not setup IPI %u", __func__, ipi); + + /* + * XXX: Surely needed on other architectures too? Either way should be + * some kind of MI hook defined in an MD header, or the responsibility + * of the MD caller if not widespread. + */ +#ifdef __aarch64__ + /* + * Ensure that this CPU's stores will be visible to IPI + * recipients before starting to send the interrupts. + */ + dsb(ishst); +#endif + + PIC_IPI_SEND(intr_irq_root_dev, ii->ii_isrc, cpus, ipi); +} + +/* + * interrupt controller dispatch function for IPIs. It should + * be called straight from the interrupt controller, when associated + * interrupt source is learned. Or from anybody who has an interrupt + * source mapped. + */ +void +intr_ipi_dispatch(u_int ipi) +{ + struct intr_ipi *ii; + + ii = intr_ipi_lookup(ipi); + if (ii->ii_count == NULL) + panic("%s: not setup IPI %u", __func__, ipi); + + intr_ipi_increment_count(ii->ii_count, PCPU_GET(cpuid)); + + ii->ii_handler(ii->ii_handler_arg); +} +#endif diff --git a/sys/sys/intr.h b/sys/sys/intr.h index bdc693e6cb60..57b0ca393912 100644 --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -148,21 +148,18 @@ int intr_release_msix(device_t, device_t, intptr_t, int); int intr_bind_irq(device_t, struct resource *, int); void intr_pic_init_secondary(void); +#endif -/* Virtualization for interrupt source IPI counter increment. */ -static inline void -intr_ipi_increment_count(u_long *counter, u_int cpu) -{ - - KASSERT(cpu < MAXCPU, ("%s: too big cpu %u", __func__, cpu)); - counter[cpu]++; -} +extern u_int intr_nirq; /* number of IRQs on intrng platforms */ -/* Virtualization for interrupt source IPI counters setup. */ -u_long * intr_ipi_setup_counters(const char *name); +/* Intr interface for IPIs. */ +#ifdef SMP +typedef void intr_ipi_handler_t(void *); +void intr_ipi_setup(u_int ipi, const char *name, intr_ipi_handler_t *hand, + void *arg); +void intr_ipi_send(cpuset_t cpus, u_int ipi); +void intr_ipi_dispatch(u_int ipi); #endif -extern u_int intr_nirq; /* number of IRQs on intrng platforms */ - #endif /* _SYS_INTR_H */ From nobody Wed Jan 24 23:50:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL10t4RjVz58xbm; Wed, 24 Jan 2024 23:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TL10t2PFLz4qhg; Wed, 24 Jan 2024 23:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hJNJ9fAh3KWF6YkvHKnJfM4idjQlEyc3SJcR2r6ifwc=; b=XbVr0umDnQE7UGgz/tMkw68nO/JF0Uqgt+J5xwpdO+nUoNzQ+LwnlqaLerAxIIXIv7uzIc f3cTc3koLMcffURH8n8APZIBBxMe7M8mJ2Uj41sVo3cOGy1YIgUsnVDyuH83H7OatA5P6Y byUehIAy4TwFcwAZjzLHAldSz5ra13iTUp7TwPbA0TGWAOszCrtlsojavzd7LJ4jvBEf4j PQAYtEWqRNUvjQVdqDYEVqTUfLPPZdaHuMPTDmcAodHC0QyqK9SQhcMGaGNpJoE6qU4lMJ xlCNDgGk4QjILx1DJDNVwC2bnJvMxhpSh/BEwfCeWimpsbdcSNZZnSt6FHP+jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hJNJ9fAh3KWF6YkvHKnJfM4idjQlEyc3SJcR2r6ifwc=; b=cW1u6+9qUz1he3hqViP9p8Kkga/AypsSqQh97p5VuRwS6iexg58CvJ4kSgn9VZ9Vlgiuy4 cYqTGsnIEl74b64q0cjwbEC5Al6d1o9WTEuCO2Z7TXy4DXb6YMN4t5wtPRceabcD40PgFz XZ0Nh05GHMwl01xzdSFhUc7iKCCcuGZ/HIwl2olrae5tNDzLuMxDyVKYSfrlHZZPQtdPBR 1V4Fvycw5ePZvcRrErY+bVxpANNYcFPyaFyGv43fpvY1NSvrAXynkCdkQwhkk3fQvANSrM TccdEpIaj3WGftf82r7HhlDHxa6MNlZi5yz0N5Cm/KPP2ZSu8fInvd+Br2OVzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706140222; a=rsa-sha256; cv=none; b=doS++zQPHIPXx72KPQCJq2FAJoH0s0Bbc+z6m9dafUKa3bCTWCYd86xT9Ly2JXtdQd6s0h x9vRUfkXNVKsfzGqAI+v8L0GxLmCMOtbhMR0n5HZLvq2s9Imsrh0q7kBIuJmquKjHyB0FV mIq2nJIslwNSCRPWn+OxT5cOASjvRropkftXX3VT1j8uXBC8sqe5VWPLmKcER7ZSShhuQU V2agNxBMEsdRG9rkJnz00O+e/AZvH2EcqazO3EQsbsiv6og6f2FMbFyj420/8k2rK+w7eK M1Rvt3zR05z173O5XzDCF3qdV9qrHmSCvJjlcatGOCyPQQfGys3dm34HfBsvgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL10t1ShwzbJ0; Wed, 24 Jan 2024 23:50:22 +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 40ONoM6p018581; Wed, 24 Jan 2024 23:50:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ONoM8Z018578; Wed, 24 Jan 2024 23:50:22 GMT (envelope-from git) Date: Wed, 24 Jan 2024 23:50:22 GMT Message-Id: <202401242350.40ONoM8Z018578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 103d39efe0c6 - main - intrng: Allow alternative IPI PICs to be registered and used List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 103d39efe0c68cb2a808c306b14c3f473a02535d Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=103d39efe0c68cb2a808c306b14c3f473a02535d commit 103d39efe0c68cb2a808c306b14c3f473a02535d Author: Jessica Clarke AuthorDate: 2024-01-24 23:49:54 +0000 Commit: Jessica Clarke CommitDate: 2024-01-24 23:49:54 +0000 intrng: Allow alternative IPI PICs to be registered and used On RISC-V, the root PIC (whether the PLIC or, as will be the case in future, the local interrupt controller) cannot send IPIs, relying on another means to trigger the necessary software interrupts (firmware calls), but there are upcoming standard devices that will be able to inject them, so we can't just put the firmware calls in the root PIC driver. Thus, split out a new intr_ipi_dev from intr_irq_root_dev to use for sending IPIs. New devices can be registered with a given priority up until the first IPI is set up, when the best device seen so far gets frozen as the IPI device to use. Reviewed by: mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D35899 --- sys/arm/arm/gic_acpi.c | 8 ++++++++ sys/arm/arm/gic_fdt.c | 7 +++++++ sys/arm/broadcom/bcm2835/bcm2836.c | 12 ++++++++++- sys/arm64/arm64/gic_v3_acpi.c | 8 ++++++++ sys/arm64/arm64/gic_v3_fdt.c | 8 ++++++++ sys/kern/subr_intr.c | 42 +++++++++++++++++++++++++++++++------- sys/sys/intr.h | 1 + 7 files changed, 78 insertions(+), 8 deletions(-) diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c index cdd2fc72a224..8b79558da6e8 100644 --- a/sys/arm/arm/gic_acpi.c +++ b/sys/arm/arm/gic_acpi.c @@ -232,6 +232,14 @@ gic_acpi_attach(device_t dev) intr_pic_deregister(dev, xref); goto cleanup; } + +#ifdef SMP + if (intr_ipi_pic_register(dev, 0) != 0) { + device_printf(dev, "could not register for IPIs\n"); + goto cleanup; + } +#endif + /* If we have children probe and attach them */ if (arm_gic_add_children(dev)) { bus_generic_probe(dev); diff --git a/sys/arm/arm/gic_fdt.c b/sys/arm/arm/gic_fdt.c index c51522b0d58c..a8886abf1c18 100644 --- a/sys/arm/arm/gic_fdt.c +++ b/sys/arm/arm/gic_fdt.c @@ -158,6 +158,13 @@ gic_fdt_attach(device_t dev) intr_pic_deregister(dev, xref); goto cleanup; } + +#ifdef SMP + if (intr_ipi_pic_register(dev, 0) != 0) { + device_printf(dev, "could not register for IPIs\n"); + goto cleanup; + } +#endif } else { if (sc->base.gic_res[2] == NULL) { device_printf(dev, diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c index f72bd9075982..8ff824d34521 100644 --- a/sys/arm/broadcom/bcm2835/bcm2836.c +++ b/sys/arm/broadcom/bcm2835/bcm2836.c @@ -646,7 +646,17 @@ bcm_lintc_pic_attach(struct bcm_lintc_softc *sc) if (pic == NULL) return (ENXIO); - return (intr_pic_claim_root(sc->bls_dev, xref, bcm_lintc_intr, sc)); + error = intr_pic_claim_root(sc->bls_dev, xref, bcm_lintc_intr, sc); + if (error != 0) + return (error); + +#ifdef SMP + error = intr_ipi_pic_register(sc->bls_dev, 0); + if (error != 0) + return (error); +#endif + + return (0); } static int diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c index e55aea86157e..f91a8f6078d9 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -351,6 +351,14 @@ gic_v3_acpi_attach(device_t dev) goto error; } +#ifdef SMP + err = intr_ipi_pic_register(dev, 0); + if (err != 0) { + device_printf(dev, "could not register for IPIs\n"); + goto error; + } +#endif + /* * Try to register the ITS driver to this GIC. The GIC will act as * a bus in that case. Failure here will not affect the main GIC diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c index 8adb0497771e..3a3647fc89a5 100644 --- a/sys/arm64/arm64/gic_v3_fdt.c +++ b/sys/arm64/arm64/gic_v3_fdt.c @@ -166,6 +166,14 @@ gic_v3_fdt_attach(device_t dev) goto error; } +#ifdef SMP + err = intr_ipi_pic_register(dev, 0); + if (err != 0) { + device_printf(dev, "could not register for IPIs\n"); + goto error; + } +#endif + /* * Try to register ITS to this GIC. * GIC will act as a bus in that case. diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index c89f12a30ec9..a03607c781b2 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -139,6 +139,10 @@ struct intr_ipi { char ii_name[INTR_IPI_NAMELEN]; u_long *ii_count; }; + +static device_t intr_ipi_dev; +static u_int intr_ipi_dev_priority; +static bool intr_ipi_dev_frozen; #endif static struct mtx pic_list_lock; @@ -380,7 +384,8 @@ intr_isrc_dispatch(struct intr_irqsrc *isrc, struct trapframe *tf) KASSERT(isrc != NULL, ("%s: no source", __func__)); - isrc_increment_count(isrc); + if ((isrc->isrc_flags & INTR_ISRCF_IPI) == 0) + isrc_increment_count(isrc); #ifdef INTR_SOLO if (isrc->isrc_filter != NULL) { @@ -396,7 +401,8 @@ intr_isrc_dispatch(struct intr_irqsrc *isrc, struct trapframe *tf) return (0); } - isrc_increment_straycount(isrc); + if ((isrc->isrc_flags & INTR_ISRCF_IPI) == 0) + isrc_increment_straycount(isrc); return (EINVAL); } @@ -1815,6 +1821,20 @@ intr_ipi_lookup(u_int ipi) return (&ipi_sources[ipi]); } +int +intr_ipi_pic_register(device_t dev, u_int priority) +{ + if (intr_ipi_dev_frozen) { + device_printf(dev, "IPI device already frozen"); + return (EBUSY); + } + + if (intr_ipi_dev == NULL || priority > intr_ipi_dev_priority) + intr_ipi_dev = dev; + + return (0); +} + /* * Setup IPI handler on interrupt controller. * @@ -1828,10 +1848,17 @@ intr_ipi_setup(u_int ipi, const char *name, intr_ipi_handler_t *hand, struct intr_ipi *ii; int error; - KASSERT(intr_irq_root_dev != NULL, ("%s: no root attached", __func__)); + if (!intr_ipi_dev_frozen) { + if (intr_ipi_dev == NULL) + panic("%s: no IPI PIC attached", __func__); + + intr_ipi_dev_frozen = true; + device_printf(intr_ipi_dev, "using for IPIs\n"); + } + KASSERT(hand != NULL, ("%s: ipi %u no handler", __func__, ipi)); - error = PIC_IPI_SETUP(intr_irq_root_dev, ipi, &isrc); + error = PIC_IPI_SETUP(intr_ipi_dev, ipi, &isrc); if (error != 0) return; @@ -1846,7 +1873,7 @@ intr_ipi_setup(u_int ipi, const char *name, intr_ipi_handler_t *hand, strlcpy(ii->ii_name, name, INTR_IPI_NAMELEN); ii->ii_count = intr_ipi_setup_counters(name); - PIC_ENABLE_INTR(intr_irq_root_dev, isrc); + PIC_ENABLE_INTR(intr_ipi_dev, isrc); } void @@ -1854,7 +1881,8 @@ intr_ipi_send(cpuset_t cpus, u_int ipi) { struct intr_ipi *ii; - KASSERT(intr_irq_root_dev != NULL, ("%s: no root attached", __func__)); + KASSERT(intr_ipi_dev_frozen, + ("%s: IPI device not yet frozen", __func__)); ii = intr_ipi_lookup(ipi); if (ii->ii_count == NULL) @@ -1873,7 +1901,7 @@ intr_ipi_send(cpuset_t cpus, u_int ipi) dsb(ishst); #endif - PIC_IPI_SEND(intr_irq_root_dev, ii->ii_isrc, cpus, ipi); + PIC_IPI_SEND(intr_ipi_dev, ii->ii_isrc, cpus, ipi); } /* diff --git a/sys/sys/intr.h b/sys/sys/intr.h index 57b0ca393912..f6957864c639 100644 --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -156,6 +156,7 @@ extern u_int intr_nirq; /* number of IRQs on intrng platforms */ #ifdef SMP typedef void intr_ipi_handler_t(void *); +int intr_ipi_pic_register(device_t dev, u_int priority); void intr_ipi_setup(u_int ipi, const char *name, intr_ipi_handler_t *hand, void *arg); void intr_ipi_send(cpuset_t cpus, u_int ipi); From nobody Wed Jan 24 23:50:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL10v502sz58xqC; Wed, 24 Jan 2024 23:50: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 4TL10v3B44z4qyH; Wed, 24 Jan 2024 23:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=77m49LqiE6WfweHtyxFO8gLHyriEYjGZ3aDGpI+5ug0=; b=x6vqE8G57CE1otCu6proPk4ejUia+cKvJuyQ2ryvAs6N1aF5uw1Y4Ch2JdaE5guO4iGBoJ 4jSoLTY0uWJ4ZPQ7MfX6VI6B0gVnQXgwDDy7Ax5KNOEq3Bp867rEYTnBL0YZFwxfmc2WFk 2FZTvEZk7bhm7i3u94a6Yj3t0PTtusjuOTzBEZBZbhvDgRJ0GHtoR7iUPsS8WedaG4unLX GYtsET9fSKUpjPHgFUogbGRA0afQQJBNv6Vc7+eaJZmjAWPxxLENXa0KwkhvVIw7v5/jTF 0ouBaQ4tqXMU+KWpZ9yWE8cfY6VGJCWPyTaDjDyriLg4lPBR+q+0ykwZepkysQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=77m49LqiE6WfweHtyxFO8gLHyriEYjGZ3aDGpI+5ug0=; b=RzIyM4gfLe5Lp71LgvpMQt0RuqK3et6+Zs6ViHG1g7WRuGLBVOd/q7tG9rbnu9WW56ebFd yOQWdZItbIg9qSqUj2mun50GNT9a3NMiqh47EKPu2FJTMasyQICJ6pBwmaoZabRcQz8k7z LENzWp14JEk1Iars9/NLcuNCu15RsH3pc02sEj4rCrQ+5mT6NLQvlIO14j1YZAY5snsjBZ vgKrb4XHbhxtJwLH36Kwfh2jauzY94jgZkRjIhfIjeFtj86CZDeywPRm2jY4aAv8WDagwK OL0tQSLMHXUOSJw+A9SH+PDMvWSKQwPza8sioJ7F6XzKMpJfpjdED+hETCRO8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706140223; a=rsa-sha256; cv=none; b=XwyV8FsUGOhEFqUrNInQeVNASbD4cdgFt0XGScaMHs04SpDnAN9eVOCQC/p4TdzxxOpi0l hX/IxlVCu8+7A7w1Z9OBE9+ETHH3WI99Ud2e1kDRxC+6B+8hvltJGUwTiTISgeZlaBP6ZE iUdb6YtTQX2gmT8N3kuEDl/3tBfX3KVuasZzpEMYXRfpwv06/VtzAP7irlHP8MxEg6/4/y GjrvsM+aYDziocBnesFjfu7rzVBAl0poT1jJ8TBBqM2rg2+zW1AfZZHE9gMEl/fovXyHhj yOnzGe35wtDRZaPJWLmo62iCtR+l2PzgqSKYU0zzvE4p82RNXgrUe7HJ1LjWkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL10v2HD3zbJ1; Wed, 24 Jan 2024 23:50: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 40ONoNXn018636; Wed, 24 Jan 2024 23:50:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ONoN1J018633; Wed, 24 Jan 2024 23:50:23 GMT (envelope-from git) Date: Wed, 24 Jan 2024 23:50:23 GMT Message-Id: <202401242350.40ONoN1J018633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c55272fdf857 - main - riscv: Create a newbus device for the SBI driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c55272fdf8570b4e15112009ad0066ed156f21a7 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c55272fdf8570b4e15112009ad0066ed156f21a7 commit c55272fdf8570b4e15112009ad0066ed156f21a7 Author: Jessica Clarke AuthorDate: 2024-01-24 23:49:54 +0000 Commit: Jessica Clarke CommitDate: 2024-01-24 23:49:54 +0000 riscv: Create a newbus device for the SBI driver This approach is based on the Arm PSCI driver, though that makes more extensive use of its softc than we do here. This will be used to extract the SBI IPI code as a real PIC. Reviewed by: mhorne, imp MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D35900 --- sys/riscv/include/sbi.h | 6 +---- sys/riscv/riscv/sbi.c | 65 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 59 insertions(+), 12 deletions(-) diff --git a/sys/riscv/include/sbi.h b/sys/riscv/include/sbi.h index 4fbdd598ec4d..bd3991e0a89f 100644 --- a/sys/riscv/include/sbi.h +++ b/sys/riscv/include/sbi.h @@ -159,11 +159,7 @@ sbi_call(uint64_t arg7, uint64_t arg6, uint64_t arg0, uint64_t arg1, return (ret); } -/* Base extension functions and variables. */ -extern u_long sbi_spec_version; -extern u_long sbi_impl_id; -extern u_long sbi_impl_version; - +/* Base extension functions. */ static __inline long sbi_probe_extension(long id) { diff --git a/sys/riscv/riscv/sbi.c b/sys/riscv/riscv/sbi.c index 630b9bbd9727..7c6d19064456 100644 --- a/sys/riscv/riscv/sbi.c +++ b/sys/riscv/riscv/sbi.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019 Mitchell Horne + * Copyright (c) 2021 Jessica Clarke * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,10 +27,11 @@ */ #include -#include #include -#include +#include #include +#include +#include #include #include @@ -39,9 +41,15 @@ #define OPENSBI_VERSION_MAJOR_OFFSET 16 #define OPENSBI_VERSION_MINOR_MASK 0xFFFF -u_long sbi_spec_version; -u_long sbi_impl_id; -u_long sbi_impl_version; +struct sbi_softc { + device_t dev; +}; + +static struct sbi_softc *sbi_softc = NULL; + +static u_long sbi_spec_version; +static u_long sbi_impl_id; +static u_long sbi_impl_version; static bool has_time_extension = false; static bool has_ipi_extension = false; @@ -315,10 +323,53 @@ sbi_init(void) } static void -sbi_late_init(void *dummy __unused) +sbi_identify(driver_t *driver, device_t parent) +{ + device_t dev; + + if (device_find_child(parent, "sbi", -1) != NULL) + return; + + dev = BUS_ADD_CHILD(parent, 0, "sbi", -1); + if (dev == NULL) + device_printf(parent, "Can't add sbi child\n"); +} + +static int +sbi_probe(device_t dev) { + device_set_desc(dev, "RISC-V Supervisor Binary Interface"); + + return (BUS_PROBE_NOWILDCARD); +} + +static int +sbi_attach(device_t dev) +{ + struct sbi_softc *sc; + + if (sbi_softc != NULL) + return (ENXIO); + + sc = device_get_softc(dev); + sc->dev = dev; + sbi_softc = sc; + EVENTHANDLER_REGISTER(shutdown_final, sbi_shutdown_final, NULL, SHUTDOWN_PRI_LAST); + + return (0); } -SYSINIT(sbi, SI_SUB_KLD, SI_ORDER_ANY, sbi_late_init, NULL); +static device_method_t sbi_methods[] = { + /* Device interface */ + DEVMETHOD(device_identify, sbi_identify), + DEVMETHOD(device_probe, sbi_probe), + DEVMETHOD(device_attach, sbi_attach), + + DEVMETHOD_END +}; + +DEFINE_CLASS_0(sbi, sbi_driver, sbi_methods, sizeof(struct sbi_softc)); +EARLY_DRIVER_MODULE(sbi, nexus, sbi_driver, 0, 0, + BUS_PASS_CPU + BUS_PASS_ORDER_FIRST); From nobody Wed Jan 24 23:50:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL10w4w7vz58xfJ; Wed, 24 Jan 2024 23:50: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 4TL10w41Grz4qqX; Wed, 24 Jan 2024 23:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zp896zkDlwLh3r7wV+C6ZWnKZXVig1/IhOr5LZh+q7k=; b=whyrFHAefaZcsU6Xrxu4/Z1vOZkRttt0zlUEjo/WMnbi4rQzew0c2eL3/Y1mt11l8abbvD xNXu6pgsxX5Sugs79u+DxAfvVatKuFITGu2xlLLyuznuDGWFVyMj6afZSK9qx/BAztup0a 17whr2up/2TkUNxrviye173gszWE7U2+1zIqpLIzhe50eIb7OullGaendo8cMBQV9/zaik GRuJwWZiwSde1svVioig3NENiRqFrBMiQrNM296ayjkPdtsZlRRUzy+MBEePoLzm1zSztw x/gllnHrs8IPeNZ5EO7YUyxq2T6ZDVZzROYCEQDJKrWDApLqEL8YiNXPpjMJkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706140224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zp896zkDlwLh3r7wV+C6ZWnKZXVig1/IhOr5LZh+q7k=; b=RUg5NecZgll4b/KDjwapmiS68do5jbC9MGV4DRShoE4iM9SFbLYyiovL8PUPmLwbhQwDfP uFkxVSSx2nwKJLp73pJ0zyRPAh8fYGentloVuxKhJMwVbr2y/6Vfm+AHL8UvBW/8hut9mC sFQ9ulxEnC7+n9AIMzQ1T/0p32pHDcfxa2CcJm9okCkePp2gj2FZcmxU+zrywQGJZ/vcsa Yu+X0ixwhQuXYrfn9ciD76vIi58g3bf7RZMtH92ZBy/rhalRSUuch2z35MQqgQkThw0nFP /sy91oLGazF8+KH1CUn/4KKTCPiNt8GGMT8yA5JxKDPQuz2n5eXmvZpNpIZVTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706140224; a=rsa-sha256; cv=none; b=wRUsERVj6sPxMv5z7pwON/lChj3IYx1Wqo5hu9NkAQLYGKEWMsqmOF2O/VHerWlIeMX8YN fNAeVNWSfPIhDVr+bQltlA1RLjX6os4s1MzLv+YHbmHvSK4Shb1L5ivZIzjjYkVEkV/d/z qI+QVT3fUTjnvIHRo6qvgUe/NqoKa3mfwB/slYI0vOvyXJU/A4KkrE/CA77fObDAc8kwXD JB3G/emgQoA7qDex8zQO1O2AydV952D0IxSjTbuB1YSBbjgTQaArFqvBZHdLZTB7le/0HD EsgwuUWgyj72GbY7OiRMOPJO8rqw8LvgvwKxlQ7UG85zy0vrTnT/3CfnV09M/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL10w372NzZft; Wed, 24 Jan 2024 23:50: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 40ONoOrH018690; Wed, 24 Jan 2024 23:50:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ONoOti018687; Wed, 24 Jan 2024 23:50:24 GMT (envelope-from git) Date: Wed, 24 Jan 2024 23:50:24 GMT Message-Id: <202401242350.40ONoOti018687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 6ec8bf9f3d17 - main - riscv: Convert local interrupt controller to a newbus PIC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ec8bf9f3d17b712d657c42f74fba936dd284d04 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=6ec8bf9f3d17b712d657c42f74fba936dd284d04 commit 6ec8bf9f3d17b712d657c42f74fba936dd284d04 Author: Jessica Clarke AuthorDate: 2024-01-24 23:49:54 +0000 Commit: Jessica Clarke CommitDate: 2024-01-24 23:49:54 +0000 riscv: Convert local interrupt controller to a newbus PIC Currently the local interrupt controller implementation is based on pre-INTRNG arm/arm64 code, using hand-rolled event code rather than INTRNG. This then interacts weirdly with the PLIC, and other future interrupt controllers like the APLIC and IMSICs in the upcoming AIA specification, since they become the root PIC despite not being the logical root. Instead, use a real newbus device for it and register it as the root PIC. This also adapts the IPI code to make use of the newly-added INTRNG generic IPI handling framework, adding a new sbi_ipi as the PIC. In future there will be alternative devices for sending IPIs that will register with higher priorities, such as the proposed AIA IMSIC and ACLINT SSWI. Reviewed by: mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D35901 --- sys/conf/files.riscv | 3 +- sys/riscv/include/intr.h | 24 +--- sys/riscv/include/smp.h | 17 +-- sys/riscv/riscv/intc.c | 311 ++++++++++++++++++++++++++++++++++++++++ sys/riscv/riscv/intr_machdep.c | 274 ----------------------------------- sys/riscv/riscv/mp_machdep.c | 162 ++++++++++++--------- sys/riscv/riscv/plic.c | 49 +++++-- sys/riscv/riscv/riscv_console.c | 2 - sys/riscv/riscv/sbi.c | 43 ++++++ sys/riscv/riscv/sbi_ipi.c | 208 +++++++++++++++++++++++++++ sys/riscv/riscv/timer.c | 33 ++++- sys/riscv/riscv/trap.c | 6 +- 12 files changed, 735 insertions(+), 397 deletions(-) diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv index 975f9d3f576e..b6a87c63422b 100644 --- a/sys/conf/files.riscv +++ b/sys/conf/files.riscv @@ -43,7 +43,7 @@ riscv/riscv/elf_machdep.c standard riscv/riscv/exception.S standard riscv/riscv/exec_machdep.c standard riscv/riscv/gdb_machdep.c optional gdb -riscv/riscv/intr_machdep.c standard +riscv/riscv/intc.c standard riscv/riscv/identcpu.c standard riscv/riscv/locore.S standard no-obj riscv/riscv/machdep.c standard @@ -58,6 +58,7 @@ riscv/riscv/ptrace_machdep.c standard riscv/riscv/riscv_console.c optional rcons riscv/riscv/riscv_syscon.c optional syscon riscv_syscon fdt riscv/riscv/sbi.c standard +riscv/riscv/sbi_ipi.c optional smp riscv/riscv/stack_machdep.c optional ddb | stack riscv/riscv/support.S standard riscv/riscv/swtch.S standard diff --git a/sys/riscv/include/intr.h b/sys/riscv/include/intr.h index a4e3a7093492..ad811dcbc449 100644 --- a/sys/riscv/include/intr.h +++ b/sys/riscv/include/intr.h @@ -35,32 +35,11 @@ #ifndef _MACHINE_INTR_MACHDEP_H_ #define _MACHINE_INTR_MACHDEP_H_ -#define RISCV_NIRQ 1024 - #ifndef NIRQ -#define NIRQ RISCV_NIRQ +#define NIRQ 1024 #endif -#ifdef INTRNG #include -#endif - -struct trapframe; - -int riscv_teardown_intr(void *); -int riscv_setup_intr(const char *, driver_filter_t *, driver_intr_t *, - void *, int, int, void **); -void riscv_cpu_intr(struct trapframe *); - -typedef unsigned long * riscv_intrcnt_t; - -riscv_intrcnt_t riscv_intrcnt_create(const char *); -void riscv_intrcnt_setname(riscv_intrcnt_t, const char *); - -#ifdef SMP -void riscv_setup_ipihandler(driver_filter_t *); -void riscv_unmask_ipi(void); -#endif enum { IRQ_SOFTWARE_USER, @@ -75,7 +54,6 @@ enum { IRQ_EXTERNAL_SUPERVISOR, IRQ_EXTERNAL_HYPERVISOR, IRQ_EXTERNAL_MACHINE, - INTC_NIRQS }; #endif /* !_MACHINE_INTR_MACHDEP_H_ */ diff --git a/sys/riscv/include/smp.h b/sys/riscv/include/smp.h index 8bafc1ac6a3a..863f0bbd6d21 100644 --- a/sys/riscv/include/smp.h +++ b/sys/riscv/include/smp.h @@ -37,14 +37,15 @@ #include -#define IPI_AST (1 << 0) -#define IPI_PREEMPT (1 << 1) -#define IPI_RENDEZVOUS (1 << 2) -#define IPI_STOP (1 << 3) -#define IPI_STOP_HARD (1 << 4) -#define IPI_HARDCLOCK (1 << 5) - -#define INTR_IPI_COUNT 1 +enum { + IPI_AST, + IPI_PREEMPT, + IPI_RENDEZVOUS, + IPI_STOP, + IPI_STOP_HARD, + IPI_HARDCLOCK, + INTR_IPI_COUNT +}; void ipi_all_but_self(u_int ipi); void ipi_cpu(int cpu, u_int ipi); diff --git a/sys/riscv/riscv/intc.c b/sys/riscv/riscv/intc.c new file mode 100644 index 000000000000..399bb05bbcfe --- /dev/null +++ b/sys/riscv/riscv/intc.c @@ -0,0 +1,311 @@ +/*- + * Copyright (c) 2015-2017 Ruslan Bukin + * All rights reserved. + * Copyright (c) 2021 Jessica Clarke + * + * Portions of this software were developed by SRI International and the + * University of Cambridge Computer Laboratory under DARPA/AFRL contract + * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme. + * + * Portions of this software were developed by the University of Cambridge + * Computer Laboratory as part of the CTSRD Project, with support from the + * UK Higher Education Innovation Fund (HEIF). + * + * 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. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include "pic_if.h" + +#define INTC_NIRQS 16 + +struct intc_irqsrc { + struct intr_irqsrc isrc; + u_int irq; +}; + +struct intc_softc { + device_t dev; + struct intc_irqsrc isrcs[INTC_NIRQS]; +}; + +static int intc_intr(void *arg); + +static phandle_t +intc_ofw_find(device_t dev, uint32_t hartid) +{ + phandle_t node; + pcell_t reg; + + node = OF_finddevice("/cpus"); + if (node == -1) { + device_printf(dev, "Can't find cpus node\n"); + return ((phandle_t)-1); + } + + for (node = OF_child(node); node != 0; node = OF_peer(node)) { + if (!ofw_bus_node_status_okay(node)) + continue; + + if (!ofw_bus_node_is_compatible(node, "riscv")) + continue; + + if (OF_searchencprop(node, "reg", ®, sizeof(reg)) == -1) + continue; + + if (reg == hartid) + break; + } + + if (node == 0) { + device_printf(dev, "Can't find boot cpu node\n"); + return ((phandle_t)-1); + } + + for (node = OF_child(node); node != 0; node = OF_peer(node)) { + if (!ofw_bus_node_status_okay(node)) + continue; + + if (ofw_bus_node_is_compatible(node, "riscv,cpu-intc")) + break; + } + + if (node == 0) { + device_printf(dev, + "Can't find boot cpu local interrupt controller\n"); + return ((phandle_t)-1); + } + + return (node); +} + +static void +intc_identify(driver_t *driver, device_t parent) +{ + device_t dev; + phandle_t node; + + if (device_find_child(parent, "intc", -1) != NULL) + return; + + node = intc_ofw_find(parent, PCPU_GET(hart)); + if (node == -1) + return; + + dev = simplebus_add_device(parent, node, 0, "intc", -1, NULL); + if (dev == NULL) + device_printf(parent, "Can't add intc child\n"); +} + +static int +intc_probe(device_t dev) +{ + device_set_desc(dev, "RISC-V Local Interrupt Controller"); + + return (BUS_PROBE_NOWILDCARD); +} + +static int +intc_attach(device_t dev) +{ + struct intc_irqsrc *isrcs; + struct intc_softc *sc; + struct intr_pic *pic; + const char *name; + phandle_t xref; + u_int flags; + int i, error; + + sc = device_get_softc(dev); + sc->dev = dev; + + name = device_get_nameunit(dev); + xref = OF_xref_from_node(ofw_bus_get_node(dev)); + + isrcs = sc->isrcs; + for (i = 0; i < INTC_NIRQS; i++) { + isrcs[i].irq = i; + flags = i == IRQ_SOFTWARE_SUPERVISOR + ? INTR_ISRCF_IPI : INTR_ISRCF_PPI; + error = intr_isrc_register(&isrcs[i].isrc, sc->dev, flags, + "%s,%u", name, i); + if (error != 0) { + device_printf(dev, "Can't register interrupt %d\n", i); + return (error); + } + } + + pic = intr_pic_register(sc->dev, xref); + if (pic == NULL) + return (ENXIO); + + return (intr_pic_claim_root(sc->dev, xref, intc_intr, sc)); +} + +static void +intc_disable_intr(device_t dev, struct intr_irqsrc *isrc) +{ + u_int irq; + + irq = ((struct intc_irqsrc *)isrc)->irq; + if (irq >= INTC_NIRQS) + panic("%s: Unsupported IRQ %u", __func__, irq); + + csr_clear(sie, 1ul << irq); +} + +static void +intc_enable_intr(device_t dev, struct intr_irqsrc *isrc) +{ + u_int irq; + + irq = ((struct intc_irqsrc *)isrc)->irq; + if (irq >= INTC_NIRQS) + panic("%s: Unsupported IRQ %u", __func__, irq); + + csr_set(sie, 1ul << irq); +} + +static int +intc_map_intr(device_t dev, struct intr_map_data *data, + struct intr_irqsrc **isrcp) +{ + struct intr_map_data_fdt *daf; + struct intc_softc *sc; + + sc = device_get_softc(dev); + + if (data->type != INTR_MAP_DATA_FDT) + return (ENOTSUP); + + daf = (struct intr_map_data_fdt *)data; + if (daf->ncells != 1 || daf->cells[0] >= INTC_NIRQS) + return (EINVAL); + + *isrcp = &sc->isrcs[daf->cells[0]].isrc; + + return (0); +} + +static int +intc_setup_intr(device_t dev, struct intr_irqsrc *isrc, + struct resource *res, struct intr_map_data *data) +{ + if (isrc->isrc_flags & INTR_ISRCF_PPI) + CPU_SET(PCPU_GET(cpuid), &isrc->isrc_cpu); + + return (0); +} + +#ifdef SMP +static void +intc_init_secondary(device_t dev) +{ + struct intc_softc *sc; + struct intr_irqsrc *isrc; + u_int cpu, irq; + + sc = device_get_softc(dev); + cpu = PCPU_GET(cpuid); + + /* Unmask attached interrupts */ + for (irq = 0; irq < INTC_NIRQS; irq++) { + isrc = &sc->isrcs[irq].isrc; + if (intr_isrc_init_on_cpu(isrc, cpu)) + intc_enable_intr(dev, isrc); + } +} +#endif + +static int +intc_intr(void *arg) +{ + struct trapframe *frame; + struct intc_softc *sc; + uint64_t active_irq; + struct intc_irqsrc *src; + + sc = arg; + frame = curthread->td_intr_frame; + + KASSERT((frame->tf_scause & SCAUSE_INTR) != 0, + ("%s: not an interrupt frame", __func__)); + + active_irq = frame->tf_scause & SCAUSE_CODE; + + if (active_irq >= INTC_NIRQS) + return (FILTER_HANDLED); + + src = &sc->isrcs[active_irq]; + if (intr_isrc_dispatch(&src->isrc, frame) != 0) { + intc_disable_intr(sc->dev, &src->isrc); + device_printf(sc->dev, "Stray irq %lu disabled\n", + active_irq); + } + + return (FILTER_HANDLED); +} + +static device_method_t intc_methods[] = { + /* Device interface */ + DEVMETHOD(device_identify, intc_identify), + DEVMETHOD(device_probe, intc_probe), + DEVMETHOD(device_attach, intc_attach), + + /* Interrupt controller interface */ + DEVMETHOD(pic_disable_intr, intc_disable_intr), + DEVMETHOD(pic_enable_intr, intc_enable_intr), + DEVMETHOD(pic_map_intr, intc_map_intr), + DEVMETHOD(pic_setup_intr, intc_setup_intr), +#ifdef SMP + DEVMETHOD(pic_init_secondary, intc_init_secondary), +#endif + + DEVMETHOD_END +}; + +DEFINE_CLASS_0(intc, intc_driver, intc_methods, sizeof(struct intc_softc)); +EARLY_DRIVER_MODULE(intc, ofwbus, intc_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_FIRST); diff --git a/sys/riscv/riscv/intr_machdep.c b/sys/riscv/riscv/intr_machdep.c deleted file mode 100644 index 6c00b29c120d..000000000000 --- a/sys/riscv/riscv/intr_machdep.c +++ /dev/null @@ -1,274 +0,0 @@ -/*- - * Copyright (c) 2015-2017 Ruslan Bukin - * All rights reserved. - * - * Portions of this software were developed by SRI International and the - * University of Cambridge Computer Laboratory under DARPA/AFRL contract - * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme. - * - * Portions of this software were developed by the University of Cambridge - * Computer Laboratory as part of the CTSRD Project, with support from the - * UK Higher Education Innovation Fund (HEIF). - * - * 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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#ifdef SMP -#include -#endif - -void intr_irq_handler(struct trapframe *tf); - -struct intc_irqsrc { - struct intr_irqsrc isrc; - u_int irq; -}; - -struct intc_irqsrc isrcs[INTC_NIRQS]; - -static void -riscv_mask_irq(void *source) -{ - int irq; - - irq = (int)(uintptr_t)source; - - switch (irq) { - case IRQ_TIMER_SUPERVISOR: - csr_clear(sie, SIE_STIE); - break; - case IRQ_SOFTWARE_USER: - csr_clear(sie, SIE_USIE); - break; - case IRQ_SOFTWARE_SUPERVISOR: - csr_clear(sie, SIE_SSIE); - break; - default: - panic("Unknown irq %d\n", irq); - } -} - -static void -riscv_unmask_irq(void *source) -{ - int irq; - - irq = (int)(uintptr_t)source; - - switch (irq) { - case IRQ_TIMER_SUPERVISOR: - csr_set(sie, SIE_STIE); - break; - case IRQ_SOFTWARE_USER: - csr_set(sie, SIE_USIE); - break; - case IRQ_SOFTWARE_SUPERVISOR: - csr_set(sie, SIE_SSIE); - break; - default: - panic("Unknown irq %d\n", irq); - } -} - -int -riscv_setup_intr(const char *name, driver_filter_t *filt, - void (*handler)(void*), void *arg, int irq, int flags, void **cookiep) -{ - struct intr_irqsrc *isrc; - int error; - - if (irq < 0 || irq >= INTC_NIRQS) - panic("%s: unknown intr %d", __func__, irq); - - isrc = &isrcs[irq].isrc; - if (isrc->isrc_event == NULL) { - error = intr_event_create(&isrc->isrc_event, isrc, 0, irq, - riscv_mask_irq, riscv_unmask_irq, NULL, NULL, "int%d", irq); - if (error) - return (error); - riscv_unmask_irq((void*)(uintptr_t)irq); - } - - error = intr_event_add_handler(isrc->isrc_event, name, - filt, handler, arg, intr_priority(flags), flags, cookiep); - if (error) { - printf("Failed to setup intr: %d\n", irq); - return (error); - } - - return (0); -} - -int -riscv_teardown_intr(void *ih) -{ - - /* TODO */ - - return (0); -} - -void -riscv_cpu_intr(struct trapframe *frame) -{ - struct intr_irqsrc *isrc; - int active_irq; - - KASSERT((frame->tf_scause & SCAUSE_INTR) != 0, - ("riscv_cpu_intr: wrong frame passed")); - - active_irq = frame->tf_scause & SCAUSE_CODE; - - CTR3(KTR_TRAP, "%s: irq=%d, umode=%d", __func__, active_irq, - TRAPF_USERMODE(frame)); - - switch (active_irq) { - case IRQ_SOFTWARE_USER: - case IRQ_SOFTWARE_SUPERVISOR: - case IRQ_TIMER_SUPERVISOR: - critical_enter(); - isrc = &isrcs[active_irq].isrc; - if (intr_isrc_dispatch(isrc, frame) != 0) - printf("stray interrupt %d\n", active_irq); - critical_exit(); - break; - case IRQ_EXTERNAL_SUPERVISOR: - intr_irq_handler(frame); - break; - } -} - -#ifdef SMP -void -riscv_setup_ipihandler(driver_filter_t *filt) -{ - - riscv_setup_intr("ipi", filt, NULL, NULL, IRQ_SOFTWARE_SUPERVISOR, - INTR_TYPE_MISC, NULL); -} - -void -riscv_unmask_ipi(void) -{ - - csr_set(sie, SIE_SSIE); -} - -/* Sending IPI */ -static void -ipi_send(struct pcpu *pc, int ipi) -{ - u_long mask; - - CTR3(KTR_SMP, "%s: cpu: %d, ipi: %x", __func__, pc->pc_cpuid, ipi); - - atomic_set_32(&pc->pc_pending_ipis, ipi); - mask = (1 << pc->pc_hart); - - sbi_send_ipi(&mask); - - CTR1(KTR_SMP, "%s: sent", __func__); -} - -void -ipi_all_but_self(u_int ipi) -{ - cpuset_t other_cpus; - - other_cpus = all_cpus; - CPU_CLR(PCPU_GET(cpuid), &other_cpus); - - CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); - ipi_selected(other_cpus, ipi); -} - -void -ipi_cpu(int cpu, u_int ipi) -{ - cpuset_t cpus; - - CPU_ZERO(&cpus); - CPU_SET(cpu, &cpus); - - ipi_send(cpuid_to_pcpu[cpu], ipi); -} - -void -ipi_selected(cpuset_t cpus, u_int ipi) -{ - struct pcpu *pc; - u_long mask; - - CTR1(KTR_SMP, "ipi_selected: ipi: %x", ipi); - - mask = 0; - STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) { - if (CPU_ISSET(pc->pc_cpuid, &cpus)) { - CTR3(KTR_SMP, "%s: pc: %p, ipi: %x\n", __func__, pc, - ipi); - atomic_set_32(&pc->pc_pending_ipis, ipi); - mask |= (1 << pc->pc_hart); - } - } - sbi_send_ipi(&mask); -} -#endif - -/* Interrupt machdep initialization routine. */ -static void -intc_init(void *dummy __unused) -{ - int error; - int i; - - for (i = 0; i < INTC_NIRQS; i++) { - isrcs[i].irq = i; - error = intr_isrc_register(&isrcs[i].isrc, NULL, - 0, "intc,%u", i); - if (error != 0) - printf("Can't register interrupt %d\n", i); - } -} - -SYSINIT(intc_init, SI_SUB_INTR, SI_ORDER_MIDDLE, intc_init, NULL); diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c index 2c144e457b4e..be5c50485bf4 100644 --- a/sys/riscv/riscv/mp_machdep.c +++ b/sys/riscv/riscv/mp_machdep.c @@ -83,7 +83,11 @@ static device_identify_t riscv64_cpu_identify; static device_probe_t riscv64_cpu_probe; static device_attach_t riscv64_cpu_attach; -static int ipi_handler(void *); +static void ipi_ast(void *); +static void ipi_hardclock(void *); +static void ipi_preempt(void *); +static void ipi_rendezvous(void *); +static void ipi_stop(void *); extern uint32_t boot_hart; extern cpuset_t all_harts; @@ -191,8 +195,13 @@ release_aps(void *dummy __unused) if (mp_ncpus == 1) return; - /* Setup the IPI handler */ - riscv_setup_ipihandler(ipi_handler); + /* Setup the IPI handlers */ + intr_ipi_setup(IPI_AST, "ast", ipi_ast, NULL); + intr_ipi_setup(IPI_PREEMPT, "preempt", ipi_preempt, NULL); + intr_ipi_setup(IPI_RENDEZVOUS, "rendezvous", ipi_rendezvous, NULL); + intr_ipi_setup(IPI_STOP, "stop", ipi_stop, NULL); + intr_ipi_setup(IPI_STOP_HARD, "stop hard", ipi_stop, NULL); + intr_ipi_setup(IPI_HARDCLOCK, "hardclock", ipi_hardclock, NULL); atomic_store_rel_int(&aps_ready, 1); @@ -244,17 +253,14 @@ init_secondary(uint64_t hart) pcpup->pc_curthread = pcpup->pc_idlethread; schedinit_ap(); - /* Enable software interrupts */ - riscv_unmask_ipi(); + /* Setup and enable interrupts */ + intr_pic_init_secondary(); #ifndef EARLY_AP_STARTUP /* Start per-CPU event timers. */ cpu_initclocks_ap(); #endif - /* Enable external (PLIC) interrupts */ - csr_set(sie, SIE_SEIE); - /* Activate this hart in the kernel pmap. */ CPU_SET_ATOMIC(hart, &kernel_pmap->pm_active); @@ -308,74 +314,59 @@ smp_after_idle_runnable(void *arg __unused) SYSINIT(smp_after_idle_runnable, SI_SUB_SMP, SI_ORDER_ANY, smp_after_idle_runnable, NULL); -static int -ipi_handler(void *arg) +static void +ipi_ast(void *dummy __unused) +{ + CTR0(KTR_SMP, "IPI_AST"); +} + +static void +ipi_preempt(void *dummy __unused) +{ + CTR1(KTR_SMP, "%s: IPI_PREEMPT", __func__); + sched_preempt(curthread); +} + +static void +ipi_rendezvous(void *dummy __unused) { - u_int ipi_bitmap; - u_int cpu, ipi; - int bit; + CTR0(KTR_SMP, "IPI_RENDEZVOUS"); + smp_rendezvous_action(); +} + +static void +ipi_stop(void *dummy __unused) +{ + u_int cpu; - csr_clear(sip, SIP_SSIP); + CTR0(KTR_SMP, "IPI_STOP"); cpu = PCPU_GET(cpuid); + savectx(&stoppcbs[cpu]); - mb(); - - ipi_bitmap = atomic_readandclear_int(PCPU_PTR(pending_ipis)); - if (ipi_bitmap == 0) - return (FILTER_HANDLED); - - while ((bit = ffs(ipi_bitmap))) { - bit = (bit - 1); - ipi = (1 << bit); - ipi_bitmap &= ~ipi; - - mb(); - - switch (ipi) { - case IPI_AST: - CTR0(KTR_SMP, "IPI_AST"); - break; - case IPI_PREEMPT: - CTR1(KTR_SMP, "%s: IPI_PREEMPT", __func__); - sched_preempt(curthread); - break; - case IPI_RENDEZVOUS: - CTR0(KTR_SMP, "IPI_RENDEZVOUS"); - smp_rendezvous_action(); - break; - case IPI_STOP: - case IPI_STOP_HARD: - CTR0(KTR_SMP, (ipi == IPI_STOP) ? "IPI_STOP" : "IPI_STOP_HARD"); - savectx(&stoppcbs[cpu]); - - /* Indicate we are stopped */ - CPU_SET_ATOMIC(cpu, &stopped_cpus); - - /* Wait for restart */ - while (!CPU_ISSET(cpu, &started_cpus)) - cpu_spinwait(); - - CPU_CLR_ATOMIC(cpu, &started_cpus); - CPU_CLR_ATOMIC(cpu, &stopped_cpus); - CTR0(KTR_SMP, "IPI_STOP (restart)"); - - /* - * The kernel debugger might have set a breakpoint, - * so flush the instruction cache. - */ - fence_i(); - break; - case IPI_HARDCLOCK: - CTR1(KTR_SMP, "%s: IPI_HARDCLOCK", __func__); - hardclockintr(); - break; - default: - panic("Unknown IPI %#0x on cpu %d", ipi, curcpu); - } - } + /* Indicate we are stopped */ + CPU_SET_ATOMIC(cpu, &stopped_cpus); + + /* Wait for restart */ + while (!CPU_ISSET(cpu, &started_cpus)) + cpu_spinwait(); - return (FILTER_HANDLED); + CPU_CLR_ATOMIC(cpu, &started_cpus); + CPU_CLR_ATOMIC(cpu, &stopped_cpus); + CTR0(KTR_SMP, "IPI_STOP (restart)"); + + /* + * The kernel debugger might have set a breakpoint, + * so flush the instruction cache. + */ + fence_i(); +} + +static void +ipi_hardclock(void *dummy __unused) +{ + CTR1(KTR_SMP, "%s: IPI_HARDCLOCK", __func__); + hardclockintr(); } struct cpu_group * @@ -574,3 +565,34 @@ cpu_mp_setmaxid(void) } } } + +void +ipi_all_but_self(u_int ipi) +{ + cpuset_t other_cpus; + + other_cpus = all_cpus; + CPU_CLR(PCPU_GET(cpuid), &other_cpus); + + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); + intr_ipi_send(other_cpus, ipi); +} + +void +ipi_cpu(int cpu, u_int ipi) +{ + cpuset_t cpus; + + CPU_ZERO(&cpus); + CPU_SET(cpu, &cpus); + + CTR3(KTR_SMP, "%s: cpu: %d, ipi: %x", __func__, cpu, ipi); + intr_ipi_send(cpus, ipi); +} + +void +ipi_selected(cpuset_t cpus, u_int ipi) +{ + CTR1(KTR_SMP, "ipi_selected: ipi: %x", ipi); + intr_ipi_send(cpus, ipi); +} diff --git a/sys/riscv/riscv/plic.c b/sys/riscv/riscv/plic.c index 1e8a03127038..406aff5bbff0 100644 --- a/sys/riscv/riscv/plic.c +++ b/sys/riscv/riscv/plic.c @@ -91,16 +91,18 @@ struct plic_context { struct plic_softc { device_t dev; - struct resource * intc_res; + struct resource *mem_res; + struct resource *irq_res; + void *ih; struct plic_irqsrc isrcs[PLIC_MAX_IRQS]; struct plic_context contexts[MAXCPU]; int ndev; }; #define RD4(sc, reg) \ - bus_read_4(sc->intc_res, (reg)) + bus_read_4(sc->mem_res, (reg)) #define WR4(sc, reg, val) \ - bus_write_4(sc->intc_res, (reg), (val)) + bus_write_4(sc->mem_res, (reg), (val)) static u_int plic_irq_cpu; @@ -276,9 +278,9 @@ plic_attach(device_t dev) /* Request memory resources */ rid = 0; - sc->intc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (sc->intc_res == NULL) { + if (sc->mem_res == NULL) { device_printf(dev, "Error: could not allocate memory resources\n"); return (ENXIO); @@ -302,7 +304,7 @@ plic_attach(device_t dev) * *** 503 LINES SKIPPED *** From nobody Thu Jan 25 00:38:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL24t6JMdz592CP; Thu, 25 Jan 2024 00:38:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TL24t0Nn9z419Y; Thu, 25 Jan 2024 00:38:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.208.172 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2cf1524cb17so28042271fa.2; Wed, 24 Jan 2024 16:38:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706143132; x=1706747932; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xE5T6/zBUYMrGvtGRbDR75KLcB67zzD7PF5zwlpgsqw=; b=HithtMiEZ11a9Mom2Olw1FDRrCF3eXBJ9ACijanC59mMnUcpIto2qKrfbfWiv5H86a G/d/rmyTfk3FOYhLBwVway4gPzN9iyVsC2ehZ+Y4Y+cajqDOX4N6VLMk0LAUV8/x07Nr Se4sTKG5EiNCl/3OdEJ6rBS3kmD6rmbrEYfPY45y/q4UyCKYoTO+3SDC9/TjGQeRzn8f 0v5Pa/xtB5QcR3uB1dmIINg20q8VuvmV/+S423dNz9DKgqxvWx/5UllPpAoQk8/WB4+D qqfyxHpnFDZjV6fnZJxkfuD+KccX3g+nkL48FEcb5p+f0uIVrewpq9eJid/pkl6pbrib D/Eg== X-Gm-Message-State: AOJu0Ywf3ck1KeexO/rztNYBwuCuJvKSFGUltObzwZW7a9oyfIbmHdSH rz8+dXD0sg+2yL3yr+R1pOLQCPc+9uWBcKFci0tZFDiaGM68AYQ1+jB5Kv2NoXAVtPPuYYdypmu I97+iYnWiMtEUvfig7IDcJ9M/mJVwqhADWxA= X-Google-Smtp-Source: AGHT+IHjG87qolCNRPmMhQIXNSz/HoiQD21u8ZC1ZcBGE+g6kVJrQ/+L2ymve3otQh3M45XayJeSOAirTAovNtvEg0c= X-Received: by 2002:a2e:819a:0:b0:2cf:20f5:efdb with SMTP id e26-20020a2e819a000000b002cf20f5efdbmr87746ljg.38.1706143132005; Wed, 24 Jan 2024 16:38:52 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202401241956.40OJuD8e023568@gitrepo.freebsd.org> In-Reply-To: From: Ed Maste Date: Wed, 24 Jan 2024 19:38:40 -0500 Message-ID: Subject: Re: git: 54d31cfb2789 - main - mount: document atime option To: Rick Macklem Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: - X-Spamd-Result: default: False [-1.58 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.32)[0.315]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; FREEFALL_USER(0.00)[carpeddiem]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_COUNT_ONE(0.00)[1]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.172:from]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.172:from] X-Rspamd-Queue-Id: 4TL24t0Nn9z419Y On Wed, 24 Jan 2024 at 17:04, Rick Macklem wrote: > > I'll note that, for an NFS mount, atime is not implemented. I found > out recently when Mike Karels asked. The NFS client does not > do a Setattr/atime upon every read from the buffer cache. As such, > the behaviour w.r.t. atime is largely undefined (and ahs been for decades) > and depends on the NFS server's file system configuration. Ah, maybe I should just mirror the text from noatime, something like: This is the default for local file systems. From nobody Thu Jan 25 00:49:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL2KH5VKnz592tk; Thu, 25 Jan 2024 00:49:39 +0000 (UTC) (envelope-from dtf@shxd.cx) Received: from shxd.cx (shxd.cx [64.201.244.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4TL2KH52glz42Bm; Thu, 25 Jan 2024 00:49:39 +0000 (UTC) (envelope-from dtf@shxd.cx) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=shxd.cx; s=shxd2024; h=Sender:To:References:Message-Id:Content-Transfer-Encoding:Cc: Date:In-Reply-To:From:Subject:Mime-Version:Content-Type:Reply-to:Content-ID: Content-Description; bh=m4NxNPpUcMl3Vm7O2dIKtudWOBy9k5ILplyXVOgl0u0=; b=iLFcU Zq6pvKXwu4Ri5e0JvbsyCO44EAPqZZZp11x5PniZ5FIF6CJBR0GLwbVrv6jM3jKKK38BhXvJ9MeLU A2O8i6JtywfxgMSd0gn3ob4J1YKMbv1wuh8pSvItK9utSM+YF4IdnCOvT6Wru9IVXHwr34t+Wfd9C dQTkwU6mvEnQ=; Received: from lummox.shxd.cx ([10.0.0.254]:60103 helo=smtpclient.apple) by shxd.cx with esmtpsa (TLS1.2) tls TLS_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1 (FreeBSD)) (envelope-from ) id 1rSnvQ-000000007yJ-1HfH; Wed, 24 Jan 2024 16:49:00 -0800 Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.500.231\)) Subject: Re: git: 54d31cfb2789 - main - mount: document atime option From: Devin Teske In-Reply-To: Date: Wed, 24 Jan 2024 16:49:28 -0800 Cc: Rick Macklem , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202401241956.40OJuD8e023568@gitrepo.freebsd.org> To: Ed Maste X-Mailer: Apple Mail (2.3731.500.231) X-Rspamd-Queue-Id: 4TL2KH52glz42Bm X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[]; ASN(0.00)[asn:36734, ipnet:64.201.240.0/20, country:US] > On Jan 24, 2024, at 4:38 PM, Ed Maste wrote: >=20 > On Wed, 24 Jan 2024 at 17:04, Rick Macklem = wrote: >>=20 >> I'll note that, for an NFS mount, atime is not implemented. I found >> out recently when Mike Karels asked. The NFS client does not >> do a Setattr/atime upon every read from the buffer cache. As such, >> the behaviour w.r.t. atime is largely undefined (and ahs been for = decades) >> and depends on the NFS server's file system configuration. >=20 > Ah, maybe I should just mirror the text from noatime, something like: > This is the default for local file systems. =F0=9F=91=8D +1= From nobody Thu Jan 25 01:24:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL35h47dzz57MW4 for ; Thu, 25 Jan 2024 01:24:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TL35h2Lsdz4554 for ; Thu, 25 Jan 2024 01:24:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-55cdaa96f34so460097a12.1 for ; Wed, 24 Jan 2024 17:24:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706145878; x=1706750678; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9rFrH/GduqaqGzGXG4Hs2ikT1P45SEPiCsjVb6USA30=; b=qwiMpeLWmW3he30NnpisnUakgc8GMolu6yHaBSGqM4gDW3AN7Oti4s6bg571oLF2L6 iBOu9+wnZoNYdScZX/1d4YX7cVBmiVd2tnw0kycLSgLK7Aod2oJVJD5ezuE4JbZj3aAD lltlR/Ue945Yl70pctPHZ2uTakzgmACaExewHnX2bMb+8kJOlCQwvUMzrOpAXWH+SDhe Ixn0uwlKQ+UDJn5IKUGCRxxWKehU6oatpbt9l/SuAWy6L+UhgJTLdDyHyfKpe2ifnuf3 CaeRk/8LxI8kMsZZkYVzc7gtYdxHFywxbeZpY9vQRcfPXoCj9/PdlLBWq7+6DK2vBUGQ B0oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706145878; x=1706750678; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9rFrH/GduqaqGzGXG4Hs2ikT1P45SEPiCsjVb6USA30=; b=u6MVk6ZLtgw8qAzggoaNPzMlOrrMpWfC4uXrKWr/to4TwbbODJ8yIEOej4o/6Qb5PS 7tVNayey6CygO0HBP3ILEmytBttETzbABLxLNVaklXIdp5cvaSegP+t2bm/EUkW6MAUM nlon9UW+ymg8y2B6FhTdDWVvdh/qYEDaTWyyld2fifMggmIQqTFfnbf1kkMoCuYm0yL9 BuCZseX4MB5SaCzy6aK3nzCWsClSTQgMmmWDa0pbmU70ggs5OspW/H1laZAG39KStDFq wXkg3JG55geuUGvpzhvRfjhQfe/OIQ9wZed3YtJpp4z/vvQefqFFACz6f0rr2W16a8Lc MNQQ== X-Gm-Message-State: AOJu0YwVUADMMOFDnlkJ1KhP9M5PbCVWfPsoj5xRT2NzpSnoVl7enOw1 NimjyI7R5bw3f3wWAqG1lrwY9esEXZ/vDYd4wPxA+IZ2hIkSKPE6Tqt/9i20vrMEPQ+HPmr0gy0 7fcBHBV6957V2Pes2j7gWLtEN2+2J2j8DfDd2Eg== X-Google-Smtp-Source: AGHT+IH7CPOqRE/1D7xSeBEebIEja07kpnS40xT/3I6z4r5vPuuyB2f+5bo7V2ewGrPUhi7t97R5LdCa/QQVUT5TehY= X-Received: by 2002:aa7:d94c:0:b0:55c:ffe4:9771 with SMTP id l12-20020aa7d94c000000b0055cffe49771mr109613eds.33.1706145877629; Wed, 24 Jan 2024 17:24:37 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202401242205.40OM5Jiq042676@gitrepo.freebsd.org> In-Reply-To: <202401242205.40OM5Jiq042676@gitrepo.freebsd.org> From: Warner Losh Date: Wed, 24 Jan 2024 18:24:26 -0700 Message-ID: Subject: Re: git: 820401bf1769 - main - nl_types.h: explicitly include cdefs.h To: Ed Maste Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000f8abb3060fbb0aa2" X-Rspamd-Queue-Id: 4TL35h2Lsdz4554 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000f8abb3060fbb0aa2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This was one of the things i wanted to comment on the that review. This change should be done as a special Linux sys/param.h that includes ctypes.h and then includes the next sys/param.h. A large number of the changes from that review are similar and i wanted yo think through the right solution. This is fragile: I'm likely to remove it again because it violates style(9) and has no docs around it. Warner On Wed, Jan 24, 2024, 3:05=E2=80=AFPM Ed Maste wrote: > The branch main has been updated by emaste: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D820401bf176996e41091d2e4190aded= 12a966b1d > > commit 820401bf176996e41091d2e4190aded12a966b1d > Author: Val Packett > AuthorDate: 2024-01-16 18:42:26 +0000 > Commit: Ed Maste > CommitDate: 2024-01-24 21:59:18 +0000 > > nl_types.h: explicitly include cdefs.h > > This file uses __BEGIN_DECLS/__END_DECLS. When bootstrapping from > Linux/musl, they were missing. > > Sponsored by: https://www.patreon.com/valpackett > Pull Request: https://github.com/freebsd/freebsd-src/pull/1066 > --- > include/nl_types.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/nl_types.h b/include/nl_types.h > index 120d1911631f..6ba15132126d 100644 > --- a/include/nl_types.h > +++ b/include/nl_types.h > @@ -34,6 +34,7 @@ > #ifndef _NL_TYPES_H_ > #define _NL_TYPES_H_ > > +#include > #include > > #ifdef _NLS_PRIVATE > --000000000000f8abb3060fbb0aa2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
This was one of the things i wanted to comment on the tha= t review.

This change should b= e done as a special Linux sys/param.h that includes ctypes.h and then inclu= des the next sys/param.h.

A large number of the changes from that review are similar and i wanted y= o think through the right solution.

This is fragile: I'm likely to remove it again because it v= iolates style(9) and has no docs around it.

Warner

On Wed, Jan 24, 2024, 3:05=E2=80=AFPM Ed Ma= ste <emaste@freebsd.org> wr= ote:
The branch main has been updat= ed by emaste:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3D820401bf176996e41091d2e4190aded12a9= 66b1d

commit 820401bf176996e41091d2e4190aded12a966b1d
Author:=C2=A0 =C2=A0 =C2=A0Val Packett <val@packett.cool>
AuthorDate: 2024-01-16 18:42:26 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-01-24 21:59:18 +0000

=C2=A0 =C2=A0 nl_types.h: explicitly include cdefs.h

=C2=A0 =C2=A0 This file uses __BEGIN_DECLS/__END_DECLS. When bootstrapping = from
=C2=A0 =C2=A0 Linux/musl, they were missing.

=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0https://www.pat= reon.com/valpackett
=C2=A0 =C2=A0 Pull Request:=C2=A0 =C2=A0h= ttps://github.com/freebsd/freebsd-src/pull/1066
---
=C2=A0include/nl_types.h | 1 +
=C2=A01 file changed, 1 insertion(+)

diff --git a/include/nl_types.h b/include/nl_types.h
index 120d1911631f..6ba15132126d 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -34,6 +34,7 @@
=C2=A0#ifndef _NL_TYPES_H_
=C2=A0#define _NL_TYPES_H_

+#include <sys/cdefs.h>
=C2=A0#include <sys/types.h>

=C2=A0#ifdef _NLS_PRIVATE
--000000000000f8abb3060fbb0aa2-- From nobody Thu Jan 25 02:22:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL4NZ3pgQz57SrP for ; Thu, 25 Jan 2024 02:22:38 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TL4NY6xhWz4Brt for ; Thu, 25 Jan 2024 02:22:37 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-40e7065b692so66938335e9.3 for ; Wed, 24 Jan 2024 18:22:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706149356; x=1706754156; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=006BSzGf6TfM6ZXwSJ8MVdf7bc8AiX7YXo4HiYWOuvk=; b=ATEyy4DAyhILBTvAUEaAo6/aMuv8pPTSkEHcyxjL/VoRQ+tshKRPWEec0zmbXlL6y+ QA6TBIn/1Sr7LjRjNqzWSXhjqDqq2nCE2Qz6nmAcch+kV/twRnVS1Fuao4Pf26X6py1x HsPDlMS/Ty95fyyskooKQPV1xOeRRjFMwjt/9I6GSun3GpMz9p8cvvkdqN2jDi+V5G7X x7xRWAnN4tK2CZpQSN5zSKozeCpfA7YZ5Ln3yeqCPLH+eXxFo4S8nRlOkI9/1nOU6RXt tNd79URzYwX/z8S7p/xnqG8jfhk5R5OlSTMw2h3DUNB12D03ez7wVRg72zpxLOnBwpFv 9t/A== X-Gm-Message-State: AOJu0Yx/BX9gEtLxiENp2S+nhZh3HKZIDHAz/THX5rptydElysWPbQzG GAL15N/fUOJF2WE9frJNGtoCauv8VUd+OIAsUnfNvnVzR4B1BD+Boql3z7DZ9/c= X-Google-Smtp-Source: AGHT+IHPHRFh9Am+oJUAsmiprZzg3/VrCsg7zPatuS5FkqHaLcy+s+a/+r2p6uKW5EVQkYatugMaSQ== X-Received: by 2002:a05:600c:2248:b0:40e:615f:32cc with SMTP id a8-20020a05600c224800b0040e615f32ccmr72311wmm.185.1706149355647; Wed, 24 Jan 2024 18:22:35 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id v19-20020a05600c445300b0040d6d755c90sm825338wmn.42.2024.01.24.18.22.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2024 18:22:35 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 820401bf1769 - main - nl_types.h: explicitly include cdefs.h From: Jessica Clarke In-Reply-To: Date: Thu, 25 Jan 2024 02:22:24 +0000 Cc: Ed Maste , src-committers , "" , "" Content-Transfer-Encoding: quoted-printable Message-Id: <549CBD3B-51AA-4BDE-A987-8E98BF1EE8C0@freebsd.org> References: <202401242205.40OM5Jiq042676@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Queue-Id: 4TL4NY6xhWz4Brt X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 25 Jan 2024, at 01:24, Warner Losh wrote: >=20 > This was one of the things i wanted to comment on the that review. >=20 > This change should be done as a special Linux sys/param.h that = includes ctypes.h and then includes the next sys/param.h. >=20 > A large number of the changes from that review are similar and i = wanted yo think through the right solution. >=20 > This is fragile: I'm likely to remove it again because it violates = style(9) and has no docs around it. Agreed this is wrong. If it were in tools/build/cross-build I wouldn=E2=80= =99t care about that, but this is base, and the whole point of the cross-build infrastructure is to not have to change base, especially system headers, wherever possible. This is the perfect example of the kind of thing that the cross-build compat headers are meant to fix. So yeah, please revert this someone, else I will. Jess > Warner >=20 > On Wed, Jan 24, 2024, 3:05=E2=80=AFPM Ed Maste = wrote: > The branch main has been updated by emaste: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D820401bf176996e41091d2e4190aded1= 2a966b1d >=20 > commit 820401bf176996e41091d2e4190aded12a966b1d > Author: Val Packett > AuthorDate: 2024-01-16 18:42:26 +0000 > Commit: Ed Maste > CommitDate: 2024-01-24 21:59:18 +0000 >=20 > nl_types.h: explicitly include cdefs.h >=20 > This file uses __BEGIN_DECLS/__END_DECLS. When bootstrapping from > Linux/musl, they were missing. >=20 > Sponsored by: https://www.patreon.com/valpackett > Pull Request: https://github.com/freebsd/freebsd-src/pull/1066 > --- > include/nl_types.h | 1 + > 1 file changed, 1 insertion(+) >=20 > diff --git a/include/nl_types.h b/include/nl_types.h > index 120d1911631f..6ba15132126d 100644 > --- a/include/nl_types.h > +++ b/include/nl_types.h > @@ -34,6 +34,7 @@ > #ifndef _NL_TYPES_H_ > #define _NL_TYPES_H_ >=20 > +#include > #include >=20 > #ifdef _NLS_PRIVATE From nobody Thu Jan 25 03:45:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL6DJ2pWsz57bxf; Thu, 25 Jan 2024 03:45: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 4TL6DJ1805z4JdN; Thu, 25 Jan 2024 03:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yKvNN74TpzYwIR/8QUz+NDQDbaGgWl99v5gk+17K3fY=; b=NPmJsNS6PXYOW1aDhzU4b+w67hkypPEZWD4uI1dyp9PHXPnqWLUybpp0mwv27lyaDlhHm3 z/U2vFwBfGg4qt2JQDxIEg4U0obtbVw96I503fiLiQBgislQfPioAP7tefZUTaRPOHBtmm vHfGnZmgxPc8YXAFSqOb4FQnV0ZTy75ue67iSn7MlLHPfg7OljKsqeSSAC0026IDC9eaK8 b6lu99HcgkoOsvxBc1nPrPlXmZAWdAQMFbsXSmJ6wFnFJdaqgkSBr/EbhfPMnFM/T12IlN iQf1lBNaj92S80y6Tnxfzx1DfhgrSvfWXKSpZHU275R0uh3UUUuuj22P1FB06w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yKvNN74TpzYwIR/8QUz+NDQDbaGgWl99v5gk+17K3fY=; b=Dye35oT5JWJaSn20AROjfGyENcd+E6IRmF+bsjpjdMStJVrI/A/pqp+H139VIUrjLd4f1o rRfvuVT58tJjizDKcGBHe1RRDxqesFKmIfMZe6Zz6R6prQACWo8FUDPAnXZMAI0m46kcKl 516CzHcqeR74N38CWcd2wVN4kCzvGeaUjWsIJbkuVeAYm4A4aKFR7Ror0CAccO4N1RHypq 06n+LqyW528/4xhcrWl1ChpO9+k3OqLzz0rdFiuFrP6QW2uKJC9Aid3l02mXhIyVv2QBNq NwfMI6MKuCUGnylSryp9KP5jqjM7U3StJzZ2TufhHtkwgJUzRMSeSs7UOebuwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154336; a=rsa-sha256; cv=none; b=WlZ8NxtXEcfpxIw7iUbRNsQe3NYNkWAX7ih1og07GoQvk7TtaFmMqzpMThwDZW+5pCYOO1 /zd3UTVqgzDhL/wiKSTrJfawLFpsD6pwjkwv59my5SmHL9ZXv/+zu15iprKKcfzai/ApsQ /60hR7YOBVsSxIVkr0KJEo+/SzWVe0YqoE3L1GdaQSNB6JTqYgz4QG7Fbb9U69HIgBZFu2 ZFLSjRre3OQNkKlLNipE3PaVa3AySzUx9Ji5Y3xGU8kKzSab8juiT9QgUCwwnquVVC1fAR /+pi+P4CFfXmrEW3xLFetceRXEbZiUBrnSUEBV79bjpuf4Q40rKlq5fNWp/J0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL6DJ06KZzjKC; Thu, 25 Jan 2024 03:45: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 40P3jZc9013118; Thu, 25 Jan 2024 03:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jZo0013115; Thu, 25 Jan 2024 03:45:35 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:35 GMT Message-Id: <202401250345.40P3jZo0013115@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: e465acd0f6b9 - stable/14 - msdosfs_rename(): handle errors from msdosfs_lookup_ino() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e465acd0f6b9bfdedd0f3dc21cde81ccade3249c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e465acd0f6b9bfdedd0f3dc21cde81ccade3249c commit e465acd0f6b9bfdedd0f3dc21cde81ccade3249c Author: Konstantin Belousov AuthorDate: 2024-01-17 22:55:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +0000 msdosfs_rename(): handle errors from msdosfs_lookup_ino() PR: 276408 (cherry picked from commit be0df84849ff3e8fb5ec65176ffde88dbefdc434) --- sys/fs/msdosfs/msdosfs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index c17d9f785dc2..726b1d8e5cb7 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1180,8 +1180,8 @@ relock: memcpy(oldname, fip->de_Name, 11); memcpy(fip->de_Name, toname, 11); /* update denode */ error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff); - MPASS(error == EJUSTRETURN); - error = createde(fip, tdip, NULL, tcnp); + if (error == EJUSTRETURN) + error = createde(fip, tdip, NULL, tcnp); if (error != 0) { memcpy(fip->de_Name, oldname, 11); goto unlock; From nobody Thu Jan 25 03:45:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL6DK2tVgz57bxg; Thu, 25 Jan 2024 03:45: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 4TL6DK1ZRMz4JdP; Thu, 25 Jan 2024 03:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WRtHOXgHH9pYcgT5Moo/svfMVj1OpmWdZ/vbab1PLM8=; b=Ay7ZvyT3qfQCiWCmfy7CxtJJomNZmLbph680MvRLwDvxQU1mPgoiL8ChG82mvgcUusMCHT 1lB1BwimQXq4Rf3WRvXbA0LH+oBJJnAq2op5xyQKmAKKYnW0YdCuuQgT7jzn3MPS+yBE6F DI9nVtH9jgWvVkk4rUcR3DXwos6DvdbDvNk3+xj8gLEzbvh99VkpMYH3uusifQjl2Uez6/ wDQpETElavabGVYAj+Sno/kjU1jtecvy1IE8mWEEyj8pipM6lBPQro7+8kx1vItHawaXJm DlvDpzdlnBqspKuxAM9wm+M6Mw7SjIDV5loFn+w13ckBXP9EeMhW1Skl9MHSMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WRtHOXgHH9pYcgT5Moo/svfMVj1OpmWdZ/vbab1PLM8=; b=C1x0Gd+dvxc6V9bnh7P50AjFiIzS2vFI1Y+T/gObiCGE6OfE0tP6kar5KBSLKYX/cqMmMr hxIdH155QkCEqQL9pFGwf/6qlowvcU6eiKY6VyJjM9J4BplPpo+X9Uw5RTMKtAi03sJBt6 w8eIH7CECPJs+zq/VQ2UsAJ7Aos1e/LQK+M3KxhZKUIqG/JfUFGmGy6WvBvggQWhUGpFxJ 22pgkD0uxfhpR02MGod7eD6TcplIqyFZt9bDQcA5V5q/ORmqLIZ/NcT2Wk3Xe2PMENYii1 aHONcts0jMW5tHjiR3lX9LbY3sbp6JxafXW5XF1dkVJOxxdP4x8z9/D60O9/7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154337; a=rsa-sha256; cv=none; b=DJ4O1Y8gwtYCDARGwRjHx0RAumHi2uuYcRELwYcOT7qoSEeDe5sNo7PLxoDBzNh1ujAEEu nVWu2WXINFft5YNIyTaO73Ej4VlxmQ84n8+YN2oEFYwdkSAmXyiMnOAikwDMRr1jDagmKq R3oj50VmSB1H/uIrT1FKynnb6yEyqWvC3WqejR+NMsTV/c1HhkMBGJcZzzx8ocfIOiVicA 996uHcqeDquXNBB4RcF8f1IbveV8unj6m5MajEt1hLh/W7tZY8snSHxeYYvyb62d2I0pUD crMUYxxw2ZA9DLwRXAYjNIktXmD+s887K8UbUNTpy1fFvcfyrTSLbUt3xGa1tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL6DK0cyGzjKD; Thu, 25 Jan 2024 03:45: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 40P3jbWB013177; Thu, 25 Jan 2024 03:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jbZu013175; Thu, 25 Jan 2024 03:45:37 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:37 GMT Message-Id: <202401250345.40P3jbZu013175@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: 884f990d95c9 - stable/14 - msdosfs_rename(): implement several XXXs about downgrading to ro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 884f990d95c9663933824f3b418000cbfe20c4d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=884f990d95c9663933824f3b418000cbfe20c4d9 commit 884f990d95c9663933824f3b418000cbfe20c4d9 Author: Konstantin Belousov AuthorDate: 2024-01-17 23:05:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +0000 msdosfs_rename(): implement several XXXs about downgrading to ro (cherry picked from commit 661db9b390b4a40418d838876b58d2186d72aabf) --- sys/fs/msdosfs/msdosfs_vnops.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 726b1d8e5cb7..31d9b003a6fa 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1203,7 +1203,10 @@ relock: MPASS(error == 0); error = removede(fdip, fip); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: removede %s %s err %d\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + fdip->de_Name, fip->de_Name, error); + msdosfs_integrity_error(pmp); goto unlock; } if (!doingdirectory) { @@ -1237,7 +1240,10 @@ relock: error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster, NOCRED, &bp); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block read error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } dotdotp = (struct direntry *)bp->b_data + 1; @@ -1250,7 +1256,10 @@ relock: if (DOINGASYNC(fvp)) bdwrite(bp); else if ((error = bwrite(bp)) != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block write error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } } From nobody Thu Jan 25 03:45:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL6DL3Cpbz57c05; Thu, 25 Jan 2024 03:45: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 4TL6DL2YBPz4JvN; Thu, 25 Jan 2024 03:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=82AUnjJQWrZyRLgEGSWeNAt6vmZxdpuqDuqBqMg6whU=; b=G5JfY3gB3uBjMNmfRk9jwiLEMCT2dyxXOwx7o2MJRN0COjrNaQoMFYhjiwKZDxHzfnmuyg oWjOVSxz4HPylwCZ7XpwPILNlZWBT870SohnHxKHEPVL6//tL8Es7nn/a0Pp44+p37gF6T L9sNcrlxQ1DfDua+UM2LJ3gUuWMsDOBdT8GxveSdJvjQUM8nm2j3kaEqwOlaeAWJ9NL8Rj TP3Cfxap4O3bzprt/qz1SQsxFe4eAVqA986SoxB3FX/ObAFAPh25jKV1nn5LD1cVpxQQ5z LW5bYBnwy7XUNZCj+xRimRI16XPQVG05GpBr8BIxs5UpLNfbAmXc80VDV+Ij7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=82AUnjJQWrZyRLgEGSWeNAt6vmZxdpuqDuqBqMg6whU=; b=K+lrew69FuJ2wvW3PSz0Tub7/ybQM6WmpWji/B9XQKqRTCbptz5Rl6y4aeR1l3ptTbHVxB 8/i4rJo5eBLLUoEEVfZEd7U7vlloirsXpA5OUd0wXfJaD23OUlFndTUBL2Kh5VlKxTA9m1 NmBYsjZlpCUpjapGgZ/YKTNK4OV2WW+VmROcZRSV1xUx6+oWl/q/jZV7DQG3Nbk71r+o9D y/JmoUSc0oCPPP2W3dpPgIA31vNwrZ/wAfv7qpx63X6MPWn/QmTqnKa5lzSua2ZHzdSP4V gQJOLInIAmYsWIvbVzdR+m/R2Jmng4Sg8n2E3UuVsmBThhjqeRHTbCE9uci15A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154338; a=rsa-sha256; cv=none; b=RkUnHj4FZPrYzz/Po9gRu8o+FNly00b6oFKcOol8zedjW4MuPXScfjFyyH/GwHoit+SEV3 g3hg0u+77ZVfqqGMyok7ZfcSve23XcERl+QvqTKw8WkLzgGGG6hKg+voiHOV/y9THflSyO Efk0bRmQm+2B5micBnuctJyDe1q6+xIT8M8V4Cos8xN5IsNBbZbnSk/GsfmePVrohry1W7 6ZM9PDdYH4vth9exgJwIdabpyrXSJlt7InFogWv+sRCVrMrnqZGOtOp1ex8uAy+F42XROm ztb7Re11OZZ9TuVr/7lP6hiiPaV4zdeH8+XO1vjF8Vfk4Dm2CuLBQdM2KlvQZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL6DL1dcTzjKF; Thu, 25 Jan 2024 03:45: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 40P3jc2x013219; Thu, 25 Jan 2024 03:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jcH6013216; Thu, 25 Jan 2024 03:45:38 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:38 GMT Message-Id: <202401250345.40P3jcH6013216@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: c315699722e8 - stable/14 - msdosfs_integrity_error(): plug possible busy leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c315699722e8dda053f8ed6def6d014bbfa5e6d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c315699722e8dda053f8ed6def6d014bbfa5e6d0 commit c315699722e8dda053f8ed6def6d014bbfa5e6d0 Author: Konstantin Belousov AuthorDate: 2024-01-18 15:35:56 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +0000 msdosfs_integrity_error(): plug possible busy leak (cherry picked from commit 13ccb04589e2c5c840e19b407a59e44cb70ac28e) --- sys/fs/msdosfs/msdosfs_vfsops.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index df96bcbfe9c6..03c794bad900 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1006,7 +1006,9 @@ msdosfs_remount_ro(void *arg, int pending) } MSDOSFS_UNLOCK_MP(pmp); - vfs_unbusy(pmp->pm_mountp); + do { + vfs_unbusy(pmp->pm_mountp); + } while (--pending >= 0); } void @@ -1015,11 +1017,19 @@ msdosfs_integrity_error(struct msdosfsmount *pmp) int error; error = vfs_busy(pmp->pm_mountp, MBF_NOWAIT); - if (error == 0) - taskqueue_enqueue(taskqueue_thread, &pmp->pm_rw2ro_task); - else + if (error == 0) { + error = taskqueue_enqueue(taskqueue_thread, + &pmp->pm_rw2ro_task); + if (error != 0) { + printf("%s: integrity error scheduling failed, " + "error %d\n", + pmp->pm_mountp->mnt_stat.f_mntfromname, error); + vfs_unbusy(pmp->pm_mountp); + } + } else { printf("%s: integrity error busying failed, error %d\n", pmp->pm_mountp->mnt_stat.f_mntfromname, error); + } } static int From nobody Thu Jan 25 03:45:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL6DM5VHBz57c06; Thu, 25 Jan 2024 03:45: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 4TL6DM3Hkpz4K40; Thu, 25 Jan 2024 03:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCrz3cUFsO3Ub+B6aw8S8faV6lbdAvK4/d/By/c/3Uc=; b=e7G/AZlV7NBgCrr753KdgqDCJvA8sHTUTxQzym2NZTvqUh7TFCM1VSW5MhloXTHlwjzjRl towNzu1+iMw8MlEsZkjmETUE9OIcj1zuSNO/zi/itwsAI3Y9EtKdKegoGL14+sbyIIggSi gBXci5Dne1+1xsHhvaVymD8/WNtDZ4URzH/tc4UM249wFA9Gb3Ya5rwGGmx4a3p6T/VeNQ uXAJDUlz8Ju70s6f29Q1zh7l6EfYpBafZLukKdYgqp25y5YsWqkvnaYU/4gzWdxnAKxb8z upLkdRBv/vzIaRAHR9BsyKXJ5K8sQSm9cPp9xnEdOTtTTlH0EsCWGbt1Xey9Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCrz3cUFsO3Ub+B6aw8S8faV6lbdAvK4/d/By/c/3Uc=; b=rnJer5TY2tkquaj06mS+eL4+5RrYV4bpk6BypM23Tg5ST4ACNS31QwrW8lVn1H7ja4a6aA MKFWc7nYuacGW3M49XpXh8MrU/lye1VlsOMZWZBMukW8mQor3Hpm4BrijnacyanDjOiJjb fAZodJ7Bj/fGeBo6fFImusLaiiip4/Ajdwo4xpiq0NA5LFteyn6iVtGWtiJKiGNx6vVIRZ 7Jh94GK4qqv2vYsecq62IwHZ4HPSU3XFaug3D23gto3LpGmFxuoL+MBlnIr17Hs8EteKlM QBOcgsNI1rhPY3JnRc2So4y+jB1GM4XPr8npV3L0mYG9uAG8YPC8o1oLsey6og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154339; a=rsa-sha256; cv=none; b=h7qG8+P7DsCnGKbkYIsFbnnXqdPr6YJOI+TwER1Fg4Y7uaN4XvAzFV2YuikWZQSVf3B4oz KGWdxUYtLKaXWTCDWmSYcMS4kJU7bt64Kn3BB2gZhX8Snmf1bPIydxoC79/ZRv9UEXMDtL PnqqKwjhKiVdQmOuqYGWSPrA5uJOrF58L7HHuOu4w0aG5Z11Ll4RV2/9O6huPTKLjVAbOs 6bY2sk2BNCfRNAJWga+6ATqI1zW4MwujWG28G/BZmcHDoPG8J3QWDRCxqjdQA4n5pcv0gf ld+WDyA3jTQ6p5JwdC1yLi21vrb/KrHxJVmL9eGE69WVMq+k+SGPk/AzYSK+EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL6DM2NBWzjKG; Thu, 25 Jan 2024 03:45: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 40P3jd67013258; Thu, 25 Jan 2024 03:45:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jd0s013255; Thu, 25 Jan 2024 03:45:39 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:39 GMT Message-Id: <202401250345.40P3jd0s013255@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: 68d021de3455 - stable/14 - msdosfs_remount_ro(): correct vfs_unbusy() loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 68d021de34550cf1d133a375ab13544d453323e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=68d021de34550cf1d133a375ab13544d453323e1 commit 68d021de34550cf1d133a375ab13544d453323e1 Author: Konstantin Belousov AuthorDate: 2024-01-19 23:50:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +0000 msdosfs_remount_ro(): correct vfs_unbusy() loop PR: 276408 (cherry picked from commit 4b3ffc5918b9968ea6ddee6f6cdf3538072e5ef4) --- sys/fs/msdosfs/msdosfs_vfsops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 03c794bad900..258c701bd300 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1006,9 +1006,8 @@ msdosfs_remount_ro(void *arg, int pending) } MSDOSFS_UNLOCK_MP(pmp); - do { + while (--pending >= 0) vfs_unbusy(pmp->pm_mountp); - } while (--pending >= 0); } void From nobody Thu Jan 25 03:51:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL6LZ4SD2z57cSm; Thu, 25 Jan 2024 03:51: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 4TL6LZ427Zz4Mcv; Thu, 25 Jan 2024 03:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cAp16xwaxd26NbDdpA7RcQlLCR5akFEQbIpOP4K0Zc=; b=bDd+bMAcfeMWDrD1quiGxc0iHMi4W5BjZOsmX/GfIYEwD2vDQ0Igbr/jVWrYf49bJ2pjC5 dxGEiHCdOzCvbLThZxO6TX/w7vpd06IvgI0/5U2p3jlYr+BnH/oiS5AxfNJ5AosDxKJprU lO402ZBVjXVyl4RIi5jkg01IyN2TKmgGmBEurATcannvxwodqfuUB9dps1tkLAKgx3UFD+ pICOvB0kM17d7w6Wn2c4GRxiujBlBThwxZk6KXNj/XHQgYHFqfwpvf5vyIBVuA3RWhN7TV YAv0a1M4XwDhaUd0wx48t3Pbj2PBjKHRKGYmTmpHlXfDPI+GUBSkK3ZRYBTB7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cAp16xwaxd26NbDdpA7RcQlLCR5akFEQbIpOP4K0Zc=; b=BUn0H0OsrnYP4usMyCwZ2T12o2jErDhnxxzn8CXFlIr35PJvg94ahdtrDfmBZoz47fKY2R ua7sZw68bTe3EtELpmaLK6DjoNuPlmPItY0WAl5oTsFcNCUE2ExvtoxWM2iKcDdt3S63vR tOPcj0uuBNYHRnuwX7SlfpgIx5OOPkSZTRE7uHx+1Q7rT5jcJQK8/6FIJkByTQsAgQTrnV BNtjaN3r6YHVDocGKOUJYcLGurGmwF+ZIJY3D0qqQPMABpRpzIUAShNASfageL6P3jmrZq Fly7939mOZubZduFu+zi4r80LogD9zDEFC/+VX2i2DRmcAav7ki6g8nbwkvygg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154662; a=rsa-sha256; cv=none; b=lPXvPiGjjVjo8cdZ0LNizMUyMpjnrw+CS449iT8613S59k8HRMCJwpIf8v/vidnWUsUqXm JuL+PyrakuGf3uHJz84pgoZCUM1sQDUj362Dduw2SH92BuGSBbKBC/M03ff+e+I8W8ykzo 0YMPQAmR4zI49UMWyuyPFt9Iixw/bI3Jct+aE6hQbXWo18+FxnlzrRmjyb0gbykEvmjqUN JxE+gzPi+8FPRZHEJn//1ht29QVjqFFDeDNvIJqVMsTogSx3GgliSewbzojpYoKF07u0Pq baju1LLF/2ClP61iqvGR1YrdYA6EqZNTbde/mz28/nrBNbHs8Rn/7g3QMD6X2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL6LZ36SQzjKb; Thu, 25 Jan 2024 03:51: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 40P3p2x4023678; Thu, 25 Jan 2024 03:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3p2on023675; Thu, 25 Jan 2024 03:51:02 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:51:02 GMT Message-Id: <202401250351.40P3p2on023675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fbd156d78fbd - main - Revert "nl_types.h: explicitly include cdefs.h" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbd156d78fbdc5e1984afe4d83436b624e7a1f01 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fbd156d78fbdc5e1984afe4d83436b624e7a1f01 commit fbd156d78fbdc5e1984afe4d83436b624e7a1f01 Author: Ed Maste AuthorDate: 2024-01-25 03:49:45 +0000 Commit: Ed Maste CommitDate: 2024-01-25 03:50:49 +0000 Revert "nl_types.h: explicitly include cdefs.h" This isn't the right approach for addressing this cross-build issue. This reverts commit 820401bf176996e41091d2e4190aded12a966b1d. --- include/nl_types.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/nl_types.h b/include/nl_types.h index 6ba15132126d..120d1911631f 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -34,7 +34,6 @@ #ifndef _NL_TYPES_H_ #define _NL_TYPES_H_ -#include #include #ifdef _NLS_PRIVATE From nobody Thu Jan 25 04:32:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7G21Z5Zz57gY2; Thu, 25 Jan 2024 04:32: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 4TL7G210CHz4Rj9; Thu, 25 Jan 2024 04:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKvuOpscyRqUcWzxnpzHbkSSDrivYZtQH19KVePaDJ4=; b=IB5f/xpeSr9klMs0znb3ulOQpDr6TtWQPJ5WiGH+PYgG5WQpA0hxrE534t+cKI5jCtQPv6 b/jx5vFLl5KuY+U11NNprLdB+ncwrKXZw9G2Q2kx2ctEDFsArmgQeBhBcOR71VcbPVhhjH N8El1Ggxfrq2Egf0OoGORn12TSrUKB49mbGgdaWouIQk9rCw7jiUGyUKCl3vPtxNr8DzEO kaWijzluRw7l0PBw/XSm9EGHW9V903r5/OiVfKw16GDJ0wl35OsV/W0EVNab3og+AwS+J+ 5hDGtdeU94bD7J/xOTZAqtZHdfKp1TTPteDzfyeVUH7tYCzdXjkBh68nwNv/uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKvuOpscyRqUcWzxnpzHbkSSDrivYZtQH19KVePaDJ4=; b=YgAiwGcn8RWu75+CtB1TtBtCwH2gZGH7l07bFyAae2L/Dv0L/cFB8awk2ivnTgBK8tgtvp AA0cvPnwElHsrwq6HskDRx0NTcmnGCIAn1bCHE3Sf2WK9nyYC+wVqxag3XrEnwcsqUt3GF XyeVYRYGztzcBIkTTrp8v3kXfJD5XwCkHGyCd2/qjs++bVDUTvV9/AS7XnCrTH+kNvQyUC reEdRKHRUEfHK2oLCT/A6goBfkXQJD0r7+xbEkr6ElslCt6HRG959p0e6AUq7KzQQFcf6M RTrlBSiwyobCklGPlXukm9G4tU0VaWaxvafchh4GhcOoB6PT4R23uqCh6ozUrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157130; a=rsa-sha256; cv=none; b=I2vQPEidyxRaB6vY30g07U5GME7YsFh/gt7obbPY4+imt9GLKj76JfufrFKefRfjxmTiKP dLaUAx5/tuhoZy0OHN2SsKK+CHa1z+a+DHN5qKgHG6Tdchs08QcixG3vUzuwaWTR37Xaok DbZW3bQ4TppPd1xT9/pmO6kz5pNzeGeIoeRRP48DPGS0m9BnHRg4sO5OnWtHr/1I8744mK izsApk+yXSLVR8hSdIfgQTNuEFSEgGdroLSE1Mc4LB0LRlHJmtAwjaQQzY2p08bYZ0ELVj M6eE3cI9u92+/pZUkB6fbyq10ssk2VrwQT8fagEh2IfJ3IxP+iLOfl25EHloDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL7G20306zkHP; Thu, 25 Jan 2024 04:32: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 40P4W9GJ092428; Thu, 25 Jan 2024 04:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4W9Q1092425; Thu, 25 Jan 2024 04:32:09 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:09 GMT Message-Id: <202401250432.40P4W9Q1092425@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: 14ef49bbadec - stable/13 - msdosfs_rename(): handle errors from msdosfs_lookup_ino() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 14ef49bbadeccf6f765025af33a07886fe3dae6f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=14ef49bbadeccf6f765025af33a07886fe3dae6f commit 14ef49bbadeccf6f765025af33a07886fe3dae6f Author: Konstantin Belousov AuthorDate: 2024-01-17 22:55:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_rename(): handle errors from msdosfs_lookup_ino() PR: 276408 (cherry picked from commit be0df84849ff3e8fb5ec65176ffde88dbefdc434) --- sys/fs/msdosfs/msdosfs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 3ab9e3b3665f..a2fc115e2ca5 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1192,8 +1192,8 @@ relock: memcpy(oldname, fip->de_Name, 11); memcpy(fip->de_Name, toname, 11); /* update denode */ error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff); - MPASS(error == EJUSTRETURN); - error = createde(fip, tdip, NULL, tcnp); + if (error == EJUSTRETURN) + error = createde(fip, tdip, NULL, tcnp); if (error != 0) { memcpy(fip->de_Name, oldname, 11); goto unlock; From nobody Thu Jan 25 04:32:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7G32YMTz57gVD; Thu, 25 Jan 2024 04:32: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 4TL7G3204dz4RS4; Thu, 25 Jan 2024 04:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=im06dLLY2a/WJEzCpCPaj2gHTq+3b/kHX5lEMWTrWQk=; b=bw5dSZNdlsnQFXOXcPfCpBKw4OU1/m7NAVv5+mjXb+Lyq0TCxahnfu2HrbBAwmUYlBZq6I 0qoRATU1SaUYqXHtzvRW8NQMzkJyx7iPfO8Zlp1Z8oDR/aEayODro7LIpGD3ciqhWy7Ekx Y5SfMY00LZLOuI4NdoGmd2ycGYtGPMqj+euRhwiuKQ73eJJI+y0P4/nWuetudJxZ7IgO+z FpA5/vI5SfxzD+JwZmfBXGMJ6dzQGoVobPIapwZExR0rQnAySwQPOcxck5gK0ZHID1wdoE cMV3bf+CaC4BFyvSKN0gkirQ+qVg9fouIEQnFiAXjbGZBj1XfEeibWgn4jkAVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=im06dLLY2a/WJEzCpCPaj2gHTq+3b/kHX5lEMWTrWQk=; b=stK2sRGJYCnsbQ/fmtDdSJHJBoK9+aZnFbt7h1zDZPlPq9UdIuh8Nebc0Rh1NQB7xnP79y e7LmRemHrLp72KPRdXSiPutUVI1K2FlfVpVvBJoLviss8ML4wNCm4L0lijoZW1i9dKX0WY 3y/tyBzjNfL6/hMF1a6FcNqYFus55o1NBLmriyRtRP0BkxsYSeIh5Mg5cKRB3mpDjiTtUm XiLi2nuDTb0JumS7xxaiLtmUhyrqQHsZC1UNhkKLuqUgMkwUi/6QDXOpwihcKspqRNY/DP xlRKIHWyfIM2Y3l61mneTv/7e8VI/bTwN50fVMnoQ9j+nwYY+KMtFi4DvuAN4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157131; a=rsa-sha256; cv=none; b=biiEzb+Qi7djD8FiLI+TWVvRQqUfWcVlNzjslZzd1LMljizrxNi8rQOFUwwh/JeR/MUUop jzFR8CCObV5RV2g0fTWD/dSYw7BmYDQcJ2xi2doVdiA5UQZepiNUpMU8e5hAncKoijytAh MsrebQC8HFN2Agfb7QlenN0GS98/BlHqiy50z9qhvOAHHZs4mc7gtRVyHUoNKVUgeiGOlk bmAPBIRPePWMIaMVBoAUgulLsdWSqN0AxPFRERUY1TMohP2qalwqTr7JAaMFsRcXCCj8nb DyAQOz4nAdKX/uT1LawhU8+qcLYV4UxOwsjFcUtGS5TbbQZmNLLwZQKt9coBDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL7G313Hyzk8L; Thu, 25 Jan 2024 04:32: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 40P4WBxv092479; Thu, 25 Jan 2024 04:32:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4WBK5092476; Thu, 25 Jan 2024 04:32:11 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:11 GMT Message-Id: <202401250432.40P4WBK5092476@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: 2ce0f6fb8d83 - stable/13 - msdosfs_rename(): implement several XXXs about downgrading to ro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2ce0f6fb8d830913b978bd5ff8a1fbdab94a3ce5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2ce0f6fb8d830913b978bd5ff8a1fbdab94a3ce5 commit 2ce0f6fb8d830913b978bd5ff8a1fbdab94a3ce5 Author: Konstantin Belousov AuthorDate: 2024-01-17 23:05:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_rename(): implement several XXXs about downgrading to ro (cherry picked from commit 661db9b390b4a40418d838876b58d2186d72aabf) --- sys/fs/msdosfs/msdosfs_vnops.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index a2fc115e2ca5..1d296c019331 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1215,7 +1215,10 @@ relock: MPASS(error == 0); error = removede(fdip, fip); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: removede %s %s err %d\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + fdip->de_Name, fip->de_Name, error); + msdosfs_integrity_error(pmp); goto unlock; } if (!doingdirectory) { @@ -1249,7 +1252,10 @@ relock: error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster, NOCRED, &bp); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block read error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } dotdotp = (struct direntry *)bp->b_data + 1; @@ -1262,7 +1268,10 @@ relock: if (DOINGASYNC(fvp)) bdwrite(bp); else if ((error = bwrite(bp)) != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block write error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } } From nobody Thu Jan 25 04:32:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7G51Dm5z57gY4; Thu, 25 Jan 2024 04:32: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 4TL7G43PQLz4RSQ; Thu, 25 Jan 2024 04:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RNL1w91eyhISOg2b74gP/WFTSxdWS71UTE8X4czWMhg=; b=sMgZaVJZsWVBUMyDep1ocaMrutyTTyvZPSTT/kr68MuakBhLaum7JBSIAYohCNihdtJVbX WMMwxCDJsBA3gXo36aCbvYfT17dvrz/dnLA98T7uxGmiR3Te6Mqdg66AKwzXXvFKFsHf9B z5WVa3P6OJjHGi0ZnQwGjWHZsdOO1Q5rqSh5zNRh3LiiJjv7Jt+UWh1ucQ9U128SWEbyDL KnHlfiUtdbMDOu2kgbuthARRssDoVNUjZHBglhquRnEkRH4m35vVA7W1qWkbHzHIriawWL Re3AHXLYxfJxQzocQCsBFWehqPtKMG2VaWrEmz70us0zSSjpqeTsvM+IbWfriw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RNL1w91eyhISOg2b74gP/WFTSxdWS71UTE8X4czWMhg=; b=JXA5gXISzZOs+Pv5y+jpo+dsDomDnLu2eCsNZ5bjSmYNwd0W47LMBeN+v6BeZXPNCzZcp2 S4GEZ4X66TSK5fcDlDTAwHTnGhBtJDe+nKnLWX7TTKp2Ki3KGwj7pPX+kIuJQSQZkHg5NT wNuJ9WMLBKYC40GDyE18TlA+ZyZ4QaJY/hI/PDuDEfg9LRVW8KsjaSNtfGLkWZkTpJR8FF rHP9Nq44DvE3watjKWsxZVkHpHLUPx3KF1DmMw6sVOjbi1EeXt4aEXlwjygVauhxoL+a36 r0Qpiw4UGSroiV6QAOivnbJHaUpISTlBmKKGTL3y2dEc41m2unTpzgaRcXBfag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157132; a=rsa-sha256; cv=none; b=ZRA9/ax11pVtxbX5rnN4WJkPhvew9s7krsHI37U9/IsLurmk9Z09YtVq72SHkz+L2d/3/m eQwGsP94PuL2g/fUD0TdIa/P9T3eCHpUbpytMM90Aw/02CzFwApXkiaQJqa+GpR2OKaMpX ihMIpl9C56kvnf10HjD3n9pMOyA/f1QFO9FvDfyHfokSpdVvt2CV3aOy0og8LE/ms8AxsJ oVNn54DcLBpQH8BjpM+iq/kF5E8wu4iEKMGvmmJFKAvsz4WvuGTmzG0r4Yxwt8WHIVt7yv MN5mhrpYFykTcNoq12v8Yk5oW7Q1NXKOMhiaI5LpyAIja+ACIp+tKOZzLkzDYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL7G423z0zkHQ; Thu, 25 Jan 2024 04:32: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 40P4WCxC092521; Thu, 25 Jan 2024 04:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4WC67092518; Thu, 25 Jan 2024 04:32:12 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:12 GMT Message-Id: <202401250432.40P4WC67092518@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: e45f10165847 - stable/13 - msdosfs_integrity_error(): plug possible busy leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e45f10165847baf419dbec40d0f10c0b2864442f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e45f10165847baf419dbec40d0f10c0b2864442f commit e45f10165847baf419dbec40d0f10c0b2864442f Author: Konstantin Belousov AuthorDate: 2024-01-18 15:35:56 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_integrity_error(): plug possible busy leak (cherry picked from commit 13ccb04589e2c5c840e19b407a59e44cb70ac28e) --- sys/fs/msdosfs/msdosfs_vfsops.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 73082976ec46..fe367122b3e3 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1008,7 +1008,9 @@ msdosfs_remount_ro(void *arg, int pending) } MSDOSFS_UNLOCK_MP(pmp); - vfs_unbusy(pmp->pm_mountp); + do { + vfs_unbusy(pmp->pm_mountp); + } while (--pending >= 0); } void @@ -1017,11 +1019,19 @@ msdosfs_integrity_error(struct msdosfsmount *pmp) int error; error = vfs_busy(pmp->pm_mountp, MBF_NOWAIT); - if (error == 0) - taskqueue_enqueue(taskqueue_thread, &pmp->pm_rw2ro_task); - else + if (error == 0) { + error = taskqueue_enqueue(taskqueue_thread, + &pmp->pm_rw2ro_task); + if (error != 0) { + printf("%s: integrity error scheduling failed, " + "error %d\n", + pmp->pm_mountp->mnt_stat.f_mntfromname, error); + vfs_unbusy(pmp->pm_mountp); + } + } else { printf("%s: integrity error busying failed, error %d\n", pmp->pm_mountp->mnt_stat.f_mntfromname, error); + } } static int From nobody Thu Jan 25 04:32:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7G556syz57gM1; Thu, 25 Jan 2024 04:32: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 4TL7G53zsJz4RKW; Thu, 25 Jan 2024 04:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUVc0BXmfmdpqiu3d8i76IOKQEIjbrpjTF18XtuyP58=; b=LhNz3VNijAhtG2Amp2Lyv6NTBsHhErjhmi0Bg1g9tMYA4d0dZwMa1xr+ruwhceg/0l8nuh A2resHmsExxPb6SBQ2zk3tQboTatl4CM7fJSLOO71XjoiM467ByugYEK9+WwnRzV/xAAV7 hbG1lOfRdG5N7jOAbH7aNdFjWgtUm8I4JHAMswTfd4+uJmzHO4mcRchW/iCRZRGMMChxXY JECdIjN1/PXThgXLKE/+KtN18bkvYp0J3tVOrQOi5q67/6L9pAwr54KZiB0HH0N/1P/19u iZcc+cXJ8kb1pWn5mMmuYNfcEW98pX3jkatU8daIoVu8darQSlm2DaemZE03jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUVc0BXmfmdpqiu3d8i76IOKQEIjbrpjTF18XtuyP58=; b=IhIrSkZANJCgBB7fJLs2HQLtwt0UDY1GKNH57qzqBqT53EdmC9AQQpQTG/QJBDghrC2mu3 V13cePlt5fu806DeOAP220jzdTcRPo+BEWcFyW0pJVvsUSQzfKjhchq8lFg3heo7Sb8OF9 oIMwtisudaxZFWfaSKN2ajEkqX49cHPKLrqWVDMTVCVR7fOm9y9jvpCsCXsCArHPDI125l Mo6i8iekOZ7Zk0RLm90uT9DH6E/FLBQFDrA0CqlnsEeL7HE9fxcnK1947h/pDgep8TCmkk DzkzfZE8T9Z+1Tg43Pv06EZWUxdPNmwgMkm/nSuoqs6eVDsZgi9u00liImItJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157133; a=rsa-sha256; cv=none; b=RbGBx8qUrKOc2WvRQVnroabD/OvjkPDfn+E784O0BKInlIvpmC0XDHynkYZjzVuXOQrgRA dFe/s0h8/7Q4Raw9f/r/D1MXM9iErSIqxnpuAhSA77f9frjcvfem+HyKRzEGw8qjLZQsD5 AJQv/0jyOh8SWJX3hUZrl0aHvYK6vVOszLCqT/ge2RPyyx8HsNX4lTZkWqwTdjk+gPKDHO gPeD9Z1cJYcYbVQXvU5BQ4+7gtKiatsnCkg1IN84p+P0va7KZKWCi3L9n91NW7MmEWtxmR XHVrda0gUnY3P2Wfawt0qtyCSsNtXCvrSaiJ/n+++eidQ+iXvpzFgeaA6PwcHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TL7G5353dzkTh; Thu, 25 Jan 2024 04:32: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 40P4WDsw092563; Thu, 25 Jan 2024 04:32:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4WDLX092560; Thu, 25 Jan 2024 04:32:13 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:13 GMT Message-Id: <202401250432.40P4WDLX092560@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: bbcc33086adc - stable/13 - msdosfs_remount_ro(): correct vfs_unbusy() loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: bbcc33086adc5e2baba3c97f1e53fedcaa504edb Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bbcc33086adc5e2baba3c97f1e53fedcaa504edb commit bbcc33086adc5e2baba3c97f1e53fedcaa504edb Author: Konstantin Belousov AuthorDate: 2024-01-19 23:50:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_remount_ro(): correct vfs_unbusy() loop PR: 276408 (cherry picked from commit 4b3ffc5918b9968ea6ddee6f6cdf3538072e5ef4) --- sys/fs/msdosfs/msdosfs_vfsops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index fe367122b3e3..b5392e62b578 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1008,9 +1008,8 @@ msdosfs_remount_ro(void *arg, int pending) } MSDOSFS_UNLOCK_MP(pmp); - do { + while (--pending >= 0) vfs_unbusy(pmp->pm_mountp); - } while (--pending >= 0); } void From nobody Thu Jan 25 04:48:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TL7cd340Tz57j00 for ; Thu, 25 Jan 2024 04:48:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TL7cc3f4Fz4THc for ; Thu, 25 Jan 2024 04:48:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-55783b7b47aso6985823a12.0 for ; Wed, 24 Jan 2024 20:48:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706158095; x=1706762895; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ynlZHQrk9q3PTTxCn2DnIFkSiQSQ95mmWMqHx7YZrjQ=; b=UbgVwnG3WqH4T3Ry23Ck2bAPeQxHoBKREvqKtI/shl6T+kF61AbFAod5LKuqxGNWhQ xTrb5HaMp0wDw//niRwPGi9TMKKT16/WT0l4MWbmHbkJdD5QwdVSfI4x0I2FbGYAiehE 2G8L9/V3IW1E/OINpkEnGBE7bxNKgQlw2q1+nton7gqSIMpSL24snOgG74WFiEDFFI/X tO8CmGoJdjkDCN0KuptD0j8Vu8K4PO+RGzN4aNOciVajyAEzjp0vBi5+rKtJ3FAUF5Hh mkjWS3vppk2NpEhMcc1+xq6zMNuVQZ1QEAJT4dmzAbcDoj1pf63IrXfapk8WOfK+N2Ux vXNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706158095; x=1706762895; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ynlZHQrk9q3PTTxCn2DnIFkSiQSQ95mmWMqHx7YZrjQ=; b=kZlSJiUO4KNAE0tlIbND3Vk6vP9QRRj0OxNX9AvXtTBC9GWPya/ftqGGBQpZAPTaBd oeWY1aI2vMU/PeBB5aev/9I4Si/+AcJxbo53BYpHow6v6UrkLHtYQzRxlMJSviVmLwDU uF+z/iQxqan/yYo2WgOG8jF+Ad8S8Lz78q1joFV0bVdl70RCjfL82j9fspOT3GaIabxQ MMoN2/jtpk1+j4cPS5NTeYYqJKt8270LNaes7gIpj+HKYkBxByHlaGLOYJ3eBgsL/JtX KUo3oefgN06Edm2HC7vUmw9NYKWH7qHiSewVE9QaPew/MPJLps8krYVwQypZGHPFQmBC 38xA== X-Gm-Message-State: AOJu0YymEfKxN7IDzGE5Q0WoIb7Gd5xYoVlf1/HnmoFydhk71oLEzaZx MzObSCE3kJdWqaI4MmI+A6XE03fncQW13C6H2n4c9Du9rCzyI2Rs2JZCneXdoNbIJXorlVPjtG1 WtKC/zCr65JPGt45fCzdNjycbmvWJqjzGdgeJ3A== X-Google-Smtp-Source: AGHT+IGCvM5K5fxfq+m69F2ZkkCMHAmdx2MmMsNJTUy8tMDUUBryQWpYEkWuw6FaxM8s7ycetJDy+WXTtvu1h4rscLY= X-Received: by 2002:aa7:c554:0:b0:55c:210b:7503 with SMTP id s20-20020aa7c554000000b0055c210b7503mr236406edr.45.1706158095105; Wed, 24 Jan 2024 20:48:15 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202401250351.40P3p2on023675@gitrepo.freebsd.org> In-Reply-To: <202401250351.40P3p2on023675@gitrepo.freebsd.org> From: Warner Losh Date: Wed, 24 Jan 2024 21:48:03 -0700 Message-ID: Subject: Re: git: fbd156d78fbd - main - Revert "nl_types.h: explicitly include cdefs.h" To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000030a393060fbde35b" X-Rspamd-Queue-Id: 4TL7cc3f4Fz4THc X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --00000000000030a393060fbde35b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thanks Ed... I think that diff --git a/tools/build/cross-build/include/linux/sys/types.h b/tools/build/cross-build/include/linux/sys/types.h index 770b3057f8a8..e72e1419bccd 100644 --- a/tools/build/cross-build/include/linux/sys/types.h +++ b/tools/build/cross-build/include/linux/sys/types.h @@ -35,6 +35,11 @@ */ #pragma once +/* + * FreeBSD's types.h always includes sys/cdefs.h, but Linux headers often don't. + */ +#include + #include_next #ifndef __size_t will filx the problem, but I can't test things easily enough. Warner On Wed, Jan 24, 2024 at 8:51=E2=80=AFPM Ed Maste wrote= : > The branch main has been updated by emaste: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dfbd156d78fbdc5e1984afe4d83436b6= 24e7a1f01 > > commit fbd156d78fbdc5e1984afe4d83436b624e7a1f01 > Author: Ed Maste > AuthorDate: 2024-01-25 03:49:45 +0000 > Commit: Ed Maste > CommitDate: 2024-01-25 03:50:49 +0000 > > Revert "nl_types.h: explicitly include cdefs.h" > > This isn't the right approach for addressing this cross-build issue. > > This reverts commit 820401bf176996e41091d2e4190aded12a966b1d. > --- > include/nl_types.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/include/nl_types.h b/include/nl_types.h > index 6ba15132126d..120d1911631f 100644 > --- a/include/nl_types.h > +++ b/include/nl_types.h > @@ -34,7 +34,6 @@ > #ifndef _NL_TYPES_H_ > #define _NL_TYPES_H_ > > -#include > #include > > #ifdef _NLS_PRIVATE > --00000000000030a393060fbde35b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Thanks Ed...

I think that

diff --git a/tools/build/cross-build/include/linux/s= ys/types.h b/tools/build/cross-build/include/linux/sys/types.h
index 770= b3057f8a8..e72e1419bccd 100644
--- a/tools/build/cross-build/include/lin= ux/sys/types.h
+++ b/tools/build/cross-build/include/linux/sys/types.h@@ -35,6 +35,11 @@
=C2=A0 */
=C2=A0#pragma once
=C2=A0
+/*+ * FreeBSD's types.h always includes sys/cdefs.h, but Linux headers o= ften don't.
+ */
+#include <sys/cdefs.h>
+
=C2=A0#inc= lude_next <sys/types.h>
=C2=A0
=C2=A0#ifndef __size_t

will filx the problem, but I can't test things easily e= nough.

Warner

On Wed, Jan 24, 2024 at 8:5= 1=E2=80=AFPM Ed Maste <emaste@free= bsd.org> wrote:
The branch main has been updated by emaste:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3Dfbd156d78fbdc5e1984afe4d83436b624e7a1f01
commit fbd156d78fbdc5e1984afe4d83436b624e7a1f01
Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-01-25 03:49:45 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-01-25 03:50:49 +0000

=C2=A0 =C2=A0 Revert "nl_types.h: explicitly include cdefs.h"

=C2=A0 =C2=A0 This isn't the right approach for addressing this cross-b= uild issue.

=C2=A0 =C2=A0 This reverts commit 820401bf176996e41091d2e4190aded12a966b1d.=
---
=C2=A0include/nl_types.h | 1 -
=C2=A01 file changed, 1 deletion(-)

diff --git a/include/nl_types.h b/include/nl_types.h
index 6ba15132126d..120d1911631f 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -34,7 +34,6 @@
=C2=A0#ifndef _NL_TYPES_H_
=C2=A0#define _NL_TYPES_H_

-#include <sys/cdefs.h>
=C2=A0#include <sys/types.h>

=C2=A0#ifdef _NLS_PRIVATE
--00000000000030a393060fbde35b-- From nobody Thu Jan 25 06:48:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH32d4Xz57tkD; Thu, 25 Jan 2024 06:48: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 4TLBH320BDz4kdN; Thu, 25 Jan 2024 06:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6epWe07O6nvbtXcwsaDwvFX/JU8crvJ82J/E/WRSfGY=; b=TVT1Sp9Mt+RCUAiFDf3BbBxsua4V2POnfytD1m+ALlzclAfTRY6cnwqFfPZRrj/keGxFs5 pUxiGFo8cnNE3AqR3OeuQ19rbHj1c3Qi/SNnsej/afe8UP+mhKsZwV45WKHrGcs/dmRAiT J98UpKAxd3dvGrmv7MCbKGfpH371oo4FquIy/6VkEUJFC2ascqhLB8DfG8g4xmBSFJiXuk C0W+P60ajnkqpkNJeeRBJh10zWQG6vZ2JUgb9bxU+uJUcZE8WJ8fSSb0HpOZKOdk8oyM/f RrT/6Ha1AmIoAhvUPY6CydVtyVOVGA9vS6YuTeyg6d1KU/mqpsnOz844e/ogqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6epWe07O6nvbtXcwsaDwvFX/JU8crvJ82J/E/WRSfGY=; b=sP7LItdyqJ0hVt5PHgGlSYhqSdrfjx7v1/vyFwxMqcDolnzsaLlY1oEfqnYDqhjlAu2Y4G 8NXczs3qxaIfMYoiRZyo4Mkj+OW3AyrRJljr+erVFVy/M5zVNlRBDv+3jmMcX3XxMeipvR 4+Bud40fPnZQk0O4YzgM4XtlrkRTYDWh0TVGWONzZ4ZD6Q+7lUvFLkZQnTEzDSG16OpbC3 RvCaGchyXVaRKNF9qxqhobquPQ08+DJto4kxfk4FAEP+0TsiYu/hwDM7+xZRhnNxDVKMcM nF0smjwjZzKpdkNHUoA5ioXddRHDlBSwSjKisi8XWgkreLW0ftATuPriFvQPgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165295; a=rsa-sha256; cv=none; b=dS+2usMQ81SPh6SgJKxpoVYVRCJrnwJJL/HukXlYlhArQJTOi8FmAAxZE7zaF+WTuxAir/ GfyJ9Onu3nEZ/lEWHkWowLnLhLk+nz+ogdFvb7zOJOo7Rmv1Z1cJ0+f7LPEl6Y0r43nZhd M5ObG59u/0rACDgHZv8eEaS20/hKIceSKJRzW2IXSSjoly/JCwoEAyrJGL6T6wkjSZRvU3 GVIUjsGYkpIBb4Qdb2zz7sIcgebOdx4zLOzxK73x9TUCmlg09NF3vgztcN00Ox0V1+IMH+ MIQOXRhhAvh93HDn6zxb5rvrIMjK05glmkl8qSXcTZ2qxdXZHXQBaf+Vzqy13g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH313mszmsD; Thu, 25 Jan 2024 06:48:15 +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 40P6mFjH016392; Thu, 25 Jan 2024 06:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mFln016389; Thu, 25 Jan 2024 06:48:15 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:15 GMT Message-Id: <202401250648.40P6mFln016389@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: 41b48170984b - stable/14 - netlink(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 41b48170984b5fd9070ff6e8e5621751479d9b8d Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=41b48170984b5fd9070ff6e8e5621751479d9b8d commit 41b48170984b5fd9070ff6e8e5621751479d9b8d Author: Gordon Bergling AuthorDate: 2024-01-22 20:52:16 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:42:56 +0000 netlink(4): Fix a typo in a source code comment - s/permament/permanent/ (cherry picked from commit c90f1ed104606f5a691ea2defc5711ca9d28fcc7) --- sys/netlink/route/neigh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/route/neigh.h b/sys/netlink/route/neigh.h index eacacc09711a..10bc3b93d16a 100644 --- a/sys/netlink/route/neigh.h +++ b/sys/netlink/route/neigh.h @@ -82,7 +82,7 @@ enum { #define NTF_PROXY 0x0008 /* proxy entry */ #define NTF_EXT_LEARNED 0x0010 /* not used */ #define NTF_OFFLOADED 0x0020 /* not used */ -#define NTF_STICKY 0x0040 /* permament entry */ +#define NTF_STICKY 0x0040 /* permanent entry */ #define NTF_ROUTER 0x0080 /* dst indicated itself as a router */ /* start of NDA_FLAGS_EXT */ #define NTF_EXT_MANAGED 0x0100 /* not used */ From nobody Thu Jan 25 06:48:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH44f1Vz57tkF; Thu, 25 Jan 2024 06:48: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 4TLBH42m4pz4kZm; Thu, 25 Jan 2024 06:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cdgaWTIMKqjRU0Nhef9xMz1VC6y07eYAMZkPvqlOzew=; b=xwV4kzDM25tN6HLuH11OZS5MgrSZh5kMpINxF1/jgXH0uPeNIQG0YaeKtfb7nA8HTP48zN oaI9aWyn4z7Ip0L/5UTspyqCtmeu9zdOr8z2pgFwl4nhyGDDrPyTZm8uvv3BVf1F+omo3k qWNJC1m5zeRSmM6V3f5frfcPO1OP0ZkFMcWBYACTDhcFHqHacrZHquyG2Z5kc8HzOANuwl Y81Tp3Nw4/4pnmiC9R2P3q48QmMAJKlo02GmqzN4Q0/f3Ke1XKcD5ov+IAOfs9gyr4kTxE 8kk4lorN0FpI09YUzmdRls7cImJE0dW3fA0iNaMARneza2XidC/+GPuCUKkTlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cdgaWTIMKqjRU0Nhef9xMz1VC6y07eYAMZkPvqlOzew=; b=iVQGWuvYUhP+6nOhCw1Y6cogSCLFhcBc5sGq1zR0fk1I1YI9JyEkvQNv3fmgenzYbK7uJ7 olrQpSOP/89kEX7kjRjQ9+OqeGnvSGhsyTs647uyPAsqbKAcAr/MIKabJ7jm8VIMnW6n7i aleHgo8kVIhJrA6npVOLSK3dWfyzULx9EuyG+TkPQSEMBbbqkXNzi/vkQd0KOSOUwDXTUe MsQvrnS6Oy1USI6HQRzCFTqMSLbLhOuTIhsg97I4USll4G7t5iuvXpZ3ZxClSsMhEPu6wh xjcuAajqXHXQQPfdSUjgknZN3LYi5P9ARpVVMmsrl0CfGs1+w0rKZVAFrHS3yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165296; a=rsa-sha256; cv=none; b=HmWRdbpscVSl5JfduTYonIjyLciLyuuwVubbk5/fuXrjL4/hXoComitzLeFuxDN8Lw/AAg 3li0Ny1AKjQdruOBuD0xUWZZvaF538afBsvYXPPhYwRTv+ZjyKl/rE7RJxsZAbJx0vLl1D HzpcBQZgkYK3FkOg2MgE0OfoKZAAAX67SspEGxFq9BA/cHPRYrLnAgiOSHMDPjO+QT/EgH FV7TBi26M+pOeY15aDaA1vX6Uk2BTX4jZcuT7PPseu3pPfh5liJmTxB16H42rU02zxlUJe e/DJ7QR1VZ4t10Npv2tvIrTrSsSMxnT5lvAy030s9I93v0U1gn5WttxliiqOsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH41qBZzn8V; Thu, 25 Jan 2024 06:48: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 40P6mGFO016455; Thu, 25 Jan 2024 06:48:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mGQU016452; Thu, 25 Jan 2024 06:48:16 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:16 GMT Message-Id: <202401250648.40P6mGQU016452@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: 80568cbfced8 - stable/14 - gjournal(8): Fix a typo in a sysctl description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 80568cbfced81534e8f90d2a5ff0dacac76fb89b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=80568cbfced81534e8f90d2a5ff0dacac76fb89b commit 80568cbfced81534e8f90d2a5ff0dacac76fb89b Author: Gordon Bergling AuthorDate: 2024-01-20 19:58:08 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:43:16 +0000 gjournal(8): Fix a typo in a sysctl description - s/entires/entries/ (cherry picked from commit 3fb6adb07915b6759892c937fe4ae8a07ed1a029) --- sys/geom/journal/g_journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 11a75e541fda..4d4fa26dd608 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -131,7 +131,7 @@ g_journal_record_entries_sysctl(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_kern_geom_journal, OID_AUTO, record_entries, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, g_journal_record_entries_sysctl, "I", - "Maximum number of entires in one journal record"); + "Maximum number of entries in one journal record"); SYSCTL_UINT(_kern_geom_journal, OID_AUTO, optimize, CTLFLAG_RW, &g_journal_do_optimize, 0, "Try to combine bios on flush and copy"); From nobody Thu Jan 25 06:48:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH54P90z57twN; Thu, 25 Jan 2024 06:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBH53nX5z4kl9; Thu, 25 Jan 2024 06:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ti1JkYxlFTtmRSlbz26VnFbkLgBb4jWhNZ76vTwtMy4=; b=XqSrjatRTxy7Mp57vL+PagZX72F+0TK6SG+thTo3PRNN/mfGU73Bb8ExXjupnXm7S2+zTE V+CbV5UrRGgLtAYBwKAHJYbPnm/1TgmY+TFQCweNCdzE8426J1nD7b9MuPf4fRqhvhlYAz 8AktdFSuAReGeHwV5D+fPK1R15QKyp8xg1m0aODBzQE5tro2OLb/LnTktuYKEbjLINcHpa EipCbuSYc5o4ohZqd4aEPvIlKAfxGzYyZXulyb0KUI89WXMRrSj9LctH6nLrdAemJuvu30 k36VuJGvH+wUhWYhYIbOx/F38i0DqKjKZtBciMh8Ssp17UZ0ilCmzJsRnAG9ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ti1JkYxlFTtmRSlbz26VnFbkLgBb4jWhNZ76vTwtMy4=; b=plbSqErT4aI6LVLPiARoerDJQCDQqj8kw32PH8v5B1xc4GF3KJ5URY6pw9BRU4ccZvfuiJ Akjf4uakBAtxPnEV5lMxtu9rZaOxGICzXGOCdlVv4o8Br3KPPnrDO8ACrmwvhmWaDCPfkQ QBdjVzDKyK+o1+eE0f7bNxMSuov0evI/ddYFPL/9WN2bRXwHpwLkyqAWm11yUakAb7xqBA LLkTAJ/uqH9NCgWgJL/fq1k/lB/ySc/rXwh1SltjQtR/RRWtLAa4MydnMjTYn4D20ibYLt 4hGlDYzIniLFy5ObEkAaiSAkHkudd4jtX44ES2hnCSYHZDOvn6omyQYHBN3j0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165297; a=rsa-sha256; cv=none; b=tg5mn19RgspH2MeAE20rG/yO604sMzgZytRGaH+rHeSP2jgUrpbPLBCO/2J+R/e3g61j+j jnm0gOq/blm7P0kRP4HN4dA/R7Z4vY32EFKVCc48fLdyqw23WF9qqcAnHlZrLBuvgTaLBr ou43pUhVEML1ZMp/GGTeb0tDTaKWHmmpCagYgcSL+2ZKm7iVCfk5MKs2LskdyRfGdiLiKA D9zwGeYQ0rS06PoTUdhWxHkEhHNnTaD4TMzyix0hVFvWj0SGSirlOHyNgansPwuHcHoVRX ScC9g36sdg8uTjF9V8JKTMy/P0g1L6KQx/cBr7sg3lxWQzJlgzhFQ3YfBbNqAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH52rfszn8X; Thu, 25 Jan 2024 06:48: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 40P6mHeF016611; Thu, 25 Jan 2024 06:48:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mH9o016608; Thu, 25 Jan 2024 06:48:17 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:17 GMT Message-Id: <202401250648.40P6mH9o016608@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: 79934439c1d8 - stable/14 - virtio(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 79934439c1d8cd67e17fa6f1ed50acc974ba293b Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=79934439c1d8cd67e17fa6f1ed50acc974ba293b commit 79934439c1d8cd67e17fa6f1ed50acc974ba293b Author: Gordon Bergling AuthorDate: 2024-01-22 20:59:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:43:30 +0000 virtio(4): Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit 97a4045aaf36079f54ee05a8cb314b8a90f20af8) --- sys/dev/virtio/network/virtio_net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index 4dfa4d3341f0..4b728f7af21a 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -210,7 +210,7 @@ struct virtio_net_ctrl_mac { * Control link announce acknowledgement * * The command VIRTIO_NET_CTRL_ANNOUNCE_ACK is used to indicate that - * driver has recevied the notification; device would clear the + * driver has received the notification; device would clear the * VIRTIO_NET_S_ANNOUNCE bit in the status field after it receives * this command. */ From nobody Thu Jan 25 06:48:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH6616yz57tql; Thu, 25 Jan 2024 06:48: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 4TLBH652xcz4klN; Thu, 25 Jan 2024 06:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlR5ehVh1xyOtKWsg6h+E5KUAURwjI2qzHViAIyBRa0=; b=eTPuYCXh3E7Z1SKSxfX9vz3/09QGO1fdTZn6yrJPd/LChkRgBp+Z7Hk+vluGDN33g7Mxs2 cCj8AScKKBxesHUHeyjj7DxHZD2BpqHnBDy+HLaQLC5fnzUBeMGIz9XVVQ8Op4BMhZO/Zz GRsqgayGpkjNivdScG+0hLH/MEwK+TCSX26qcB3JGzWhoMNgRHnN4xAys6WBtarxhCJKxU TiJBBrTL8YjWI3Ygd8FRyll/2AVXXeASlgY+7hXXKdiv1WOGskr8KP+D4tj+QkOehF+5g2 tZ7aBoTYq95ICWXv7I0D1AhaBoC5UmiWd8OFAykPp4FDuOMDTt/fKIxm6OqR0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlR5ehVh1xyOtKWsg6h+E5KUAURwjI2qzHViAIyBRa0=; b=SFpPI0+u9Eg8ktnAcVn2E7UEKrVHQSmmV3YqqTeaSkqsR3ogacaTs95pBBec+bgEU0S2sf bALb2BeEbotlvlEj5baDF/yckHspsfN2Jet4T4LKTKtrqzWkMUc4Wi3zOfnhQXSISnKtCG sZAYAYJEgfmP4sfCqj+PIQvELTwK/Y52hxNiEhI//hsbu2MdFbUz6fGmAS6zDD0RO6YsPC 7J/6BcUvyAweFTPxu4jeWbpl0vp1gjlmvRJEs3AR30V9bqkKzxBrCS4ITt7Sr9BoADa+90 1ADZ52c8NA1boKBEvABBYBVODeCqMiWwKkA2IJ1uiTLqdtqIsmoqzAmKsvRi3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165298; a=rsa-sha256; cv=none; b=yysvu0RA/SZiVoeEts6IZR7a1rfGDuZ0XEob5VCz/Lboz18nEy0Mt1M1gqjGhG8gbswb/w chOVEnmIsqm/Q2x7bqo9pBM6ye/MyqTcWmDehhqRrJYQcc14/nJMMDjsjeilhTBS3KfHey hJ5+PuKV6nRwNF18KE9vOGxCCAu5jYWMJdZXGm6+4Do9N92kasQPpi5URrShx+eSQ5vHXS q0j46JWfmnePCw5uDAJX6ebgh8nD8HjEx4D6Y45NxlQ5c5HuQUWmJ1sgN21mi1sJMkhEgh vkgVDUvOqMezliZqZIWZ9CJHvUN1xhfg6Vv3LEKUMbB7+a9c6uS8XUQxmb0YpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH64797zn70; Thu, 25 Jan 2024 06:48:18 +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 40P6mIgC016694; Thu, 25 Jan 2024 06: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 40P6mINZ016691; Thu, 25 Jan 2024 06:48:18 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:18 GMT Message-Id: <202401250648.40P6mINZ016691@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: a7fb3cfeb3e1 - stable/14 - rtsock: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a7fb3cfeb3e1f9eb2642e6e2172bb384de174fd1 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a7fb3cfeb3e1f9eb2642e6e2172bb384de174fd1 commit a7fb3cfeb3e1f9eb2642e6e2172bb384de174fd1 Author: Gordon Bergling AuthorDate: 2024-01-22 20:53:21 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:43:49 +0000 rtsock: Fix a typo in a source code comment - s/adddress/address/ (cherry picked from commit ab6d773dbf926e4f92e37b67a85c3290cfb90723) --- sys/net/rtsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 019b9e80291c..caee9bd6e83f 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -683,7 +683,7 @@ fill_addrinfo(struct rt_msghdr *rtm, int len, struct linear_buffer *lb, u_int fi /* * A host route through the loopback interface is - * installed for each interface adddress. In pre 8.0 + * installed for each interface address. In pre 8.0 * releases the interface address of a PPP link type * is not reachable locally. This behavior is fixed as * part of the new L2/L3 redesign and rewrite work. The From nobody Thu Jan 25 06:48:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH80ycXz57tlX; Thu, 25 Jan 2024 06:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBH764dzz4krC; Thu, 25 Jan 2024 06: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=1706165299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5KEHRbXQ6YbExAOfLFeu48ZJmocIyJw48jOwJTaY2Bg=; b=VFpA8TuNbw7Z2g8lloaUR+ajNXCoG4CeSg/5tL35TjNbQmVhTD7lqI/Bpe/jzqu65Oiuev xUxUn+SiF+qGolwiczi188KwjkrRyeL2JjSQJUhzlhASereMrAYoSvpGMgAgxKIrfjLutt 8XO6PNANRSnEwOeWKjDDVuWcvwfthDWcnX1VAhJMjRKxz2Rv72wR8CzQV929nFjv6mKRys aHyDWKxzxDD/tHuqgPgY4n5ToMSMXPdMeREB2HPPuwPpSX1/cxJo46x4KBM2XU4CD9qWhj 6YkNKwAkZoiKIVQzKMTHd3747ZvAuBqmAm4xywfx6QUeUEFAmS2hREre/vBK3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5KEHRbXQ6YbExAOfLFeu48ZJmocIyJw48jOwJTaY2Bg=; b=xkHoMPNK6A9NhhyDFv2FO8p1FG1s8cll+IjfcyXRbTodljl//f3Dp+A89MTQ57Wb/S4VMO dlU7rUOfcjOmmJQMRRf0J1FY3gq4h9ew7IeEuuwc8aSd0M+4NKRnncmPiuS56U0+rPDIqn YTmxiKWm5bZr6Djgw3YkJAtlb+yA9VB3ya0H11OAVbrlDClOs8HhTbtvmpju22TYlcQDxB nugY1B78LwPUbclQDHndQsv2crjxJSayYoMozOctZkzP5YIV9gHlEXVWcZwOZ7P4Tl2AjU /oT3iSANuxffxfupjlHIRn0GnaOws/WxBt8ADgm+JWyZIlEPvfyRbZ6RYaGKpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165299; a=rsa-sha256; cv=none; b=s193lRsALGvgJ+g+jZzIZqwVBkRPAdQhAO4cjxrQzK4WKBTIhe6m9A+D975aQeXT1UgNYB oREHXN3I5rlUGnNoDy3PXUAZyKC9ryIMaJUk74AykmzJZGNTMDOanAOKGYvppaZbOfasqS X/z5TPdlmpx5BIkMwkWWH1RxpM4iuVz9gNYR3Y6U3Aye0e0NxR2E3ucjcJDy2UWzYUtbPD 4urKNz810OcEJtLwQCzOPl0yyOpq9AhBzFZ8aEhbrVyLGTPGXwubk9SbqOe25evgw/JL0p qqZ+7NRPv6cUheKxdMg5Sb6sLKYeMvThvGI0UpFly6MX5uFOf7F/2DdP8Y1t8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH757yDzmsF; Thu, 25 Jan 2024 06: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 40P6mJcn016749; Thu, 25 Jan 2024 06:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mJxc016746; Thu, 25 Jan 2024 06:48:19 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:19 GMT Message-Id: <202401250648.40P6mJxc016746@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: d7b74e01f4dc - stable/14 - aic7xxx: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d7b74e01f4dcffd765e77ed7c71f22a6ea301558 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d7b74e01f4dcffd765e77ed7c71f22a6ea301558 commit d7b74e01f4dcffd765e77ed7c71f22a6ea301558 Author: Gordon Bergling AuthorDate: 2024-01-22 20:47:23 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:44:15 +0000 aic7xxx: Fix two typos in source code comments - s/recevied/received/ (cherry picked from commit b971c51a4d9498c26079fd8229f7af6ef1585020) --- sys/dev/aic7xxx/aic79xx.seq | 2 +- sys/dev/aic7xxx/aic7xxx.seq | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq index 118c4f187486..85957102eb5e 100644 --- a/sys/dev/aic7xxx/aic79xx.seq +++ b/sys/dev/aic7xxx/aic79xx.seq @@ -1198,7 +1198,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq index 1ae250d880bf..a94e2dae4149 100644 --- a/sys/dev/aic7xxx/aic7xxx.seq +++ b/sys/dev/aic7xxx/aic7xxx.seq @@ -1639,7 +1639,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; From nobody Thu Jan 25 06:48:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBH92kbwz57v02; Thu, 25 Jan 2024 06:48: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 4TLBH86kx9z4ktk; Thu, 25 Jan 2024 06:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urEB9jRJLq6jORsNaZk0zteZNxx4SxjDYhvY4qb/FbU=; b=W+Zh2Z9XGUsqLg3FXBq7evMLDx9QVyhU6lyE79y079MN13I1up7iXy9VRxkRpdwnmxIg6v bGBrSw7awvFk85RLo6Po4/e+X1FdoJngpNscf9NAWQV/u2ijC/JErCT+ONyuCSrMpN5iEa H4fmmaQoo3IXjs/n9OcQG7vlEhhIwkK6xRzZcEd6phEzNiX3doRFE4lupqUd1Dvvf6ZEnS /ZgfIZLyERRQ9lUiXeO1bwwGwu0NfKvZfmPG+Y9X8XXOq8z34ECIu/5LwC5IQMTulD3f3c ahJ8ZHmqTmTMWKR/sOCBjcPRNJWK0QNklttkW77mTEfsjqByAKFf6fDHLye7eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urEB9jRJLq6jORsNaZk0zteZNxx4SxjDYhvY4qb/FbU=; b=OMmTpHHGYJi3V7l9VL2o875gxQPnlWq9vD7MYbrNXEDiUkb9idrk2sEGY+E7fg8694v/Xz GRBgTP+ZixpzUazwl0Elsdzc6O3Lw2SjOqhVJwU+5hj9EctiB2yqizQ9VkREob5Qdt3ZY7 bJDyoDe2xXwoLAv47voK4Raxlepn/R4WWmm6SqoiHsAOAuQBUVe6/pFYTLLhAPYHHFfM+i OAbmG2jYsrPw9xiYAOOG/hIiG7TyieL78TjtV2qpzFzwgXPTyxmm9ZZy8V91PgJdwEyWck k3IcWwV8xBmFQ+OC4Ze3PYaNci7xurvA2T6/IyrG7YYJZynx2cM3hi88xxjxOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165300; a=rsa-sha256; cv=none; b=tTWIqOR+xeJGf8pJyOTtFBWTeKEsP53btmHlji/GnDAxdruzjPypK3L9+qSW/apVJaBjkk EYeVyOdcnErSUKuFEuKnztXfmQ9GlWKclQvK6MXP982u47HHyi1geABTgJ4ok+TDUZNTug DG1S6691ylrckKgRHaAldJtWVU7EbTRaG5cPgTwY7EHl7Z369/yuTmaxlabb7qc6QHduGc naaGZORuTUvC8H7TKszUqfpoUoT1P4xfVDReFvW3Bf1N4jUbyzctNj+S42RcCC/a7uM7EI pqJak1C3In97ICf/NsAnkqt3S5+6C6j6sElhtf9YYdIJdyVXSkC3yusqO7S1Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH85qPRzmsG; Thu, 25 Jan 2024 06:48:20 +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 40P6mKXn016804; Thu, 25 Jan 2024 06:48:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mK5r016801; Thu, 25 Jan 2024 06:48:20 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:20 GMT Message-Id: <202401250648.40P6mK5r016801@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: 0334b131c53d - stable/14 - tcp_fastopen: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 0334b131c53dd9398d8df722ab61041f2457846d Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0334b131c53dd9398d8df722ab61041f2457846d commit 0334b131c53dd9398d8df722ab61041f2457846d Author: Gordon Bergling AuthorDate: 2024-01-22 20:49:47 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:44:39 +0000 tcp_fastopen: Fix a typo in a source code comment - s/posession/possession/ (cherry picked from commit 9b035689f15fc4aec96f9c18c6c86bd615faed2f) --- sys/netinet/tcp_fastopen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index c31225214d1d..609637b83df3 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -43,7 +43,7 @@ * * In addition to the facilities defined in RFC7413, this implementation * supports a pre-shared key (PSK) mode of operation in which the TFO server - * requires the client to be in posession of a shared secret in order for + * requires the client to be in possession of a shared secret in order for * the client to be able to successfully open TFO connections with the * server. This is useful, for example, in environments where TFO servers * are exposed to both internal and external clients and only wish to allow From nobody Thu Jan 25 06:48:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHB2Dpnz57tsv; Thu, 25 Jan 2024 06:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHB0cdvz4km6; Thu, 25 Jan 2024 06:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqA+++WWkcML+qXSdpuFErDnRb2c/iijOjqTob0qI+k=; b=ZbNPTvvYU8pQe2EUbYarWG+tE1zX+npl8D8/37Iq7PDg2Ks5RBFl84fN6yg1pyr8Gl5tmn o8Bq6sBi5An8LzeLwsYjNY8pa7YFCeeoFSEQnT9UDPlgIwW+orVnQMjS8PhC8vf79I0eAR tyQEIzd+t2izeGS4u5605n3TZDJ+3yRA05X0C06LKHyTeZq5Vj+SWHjiUbriIHVAyOLHAX xtOHGrwbcylOeG1MM4whm21k6XMFFHAKAKsBHt/T9PLGAvYjwQqbTZSZde/Urs/ACDMBYn 8JDXNgZh8A7wTUAkCBGQe/XEN4r+c5YCVyQJjTy9vrL3Q0vKHk1DH69LrQNxlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqA+++WWkcML+qXSdpuFErDnRb2c/iijOjqTob0qI+k=; b=HEQW/EdAbTYNPpJPRZ1XPnPUZhensN4XNkg+5Vu1+cOqRQfSMGYdLf9NsSbEiJSbH6I+Kd E+rnbGEHqaXNNGmSMY48qpemH1kFFq9ZszvZkrbuwmimVY3znsosoYs7Dz1d5vcn3/vu69 dsIfkXn4McsZkCq6mPDy+WZnlglxOYRtIsYCbil6SUDbJ6pGon4YIyMJfcrGMFjwyU/fAQ Q3Jn1ftLHG4k7eUaBhjBgMz9mqsyCa0JImLohoyJr1jdWx8ESYB9i+AIGb1p8gl4m/O5om C+t6wN7rP/H5e2ZHBHqTZCIx6/sK/evsa3LULFWbZYiREz1pxylIEKgIzVk1uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165302; a=rsa-sha256; cv=none; b=OQUbOiBbyc4d2H24UfB1cCqqFORJVRsQWTkFuYDqV+KLa2vzMz2fJDq3NkBvOMZNIXGwTn c7H4Whe+xUOxJlDtULXVvIDFnTZSl4GFDECZfdA+Va5Dpc+e3lMbHyKT757W+hQvowgw5n MTZvZirnDWaQ9fm8MU9Fjzm9mteeElztMtR2m0Md8bds/cnTBISA10L0wGpvYjtlKmgIiA DOqv121egTN1Nuq5oOFRf/SAjpDYZa7LdgR+2JirmOgGDqpIbpTuAhYKw+iOd1hl4EYpCS 6cBTFAh1RjEIcfPJ8qxbsmlyyhcYGY+WceSpDfaznOYDiKkNXvD23ohBjV9uVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBH96rlJzn71; Thu, 25 Jan 2024 06:48: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 40P6mLhj016852; Thu, 25 Jan 2024 06:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mL4x016849; Thu, 25 Jan 2024 06:48:21 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:21 GMT Message-Id: <202401250648.40P6mL4x016849@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: a499baff3955 - stable/14 - vmd(4): Fix typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a499baff3955b9edacd56c44cf30386e26822e17 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a499baff3955b9edacd56c44cf30386e26822e17 commit a499baff3955b9edacd56c44cf30386e26822e17 Author: Gordon Bergling AuthorDate: 2024-01-22 20:55:33 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:44:55 +0000 vmd(4): Fix typos in source code comments - s/harwdare/hardware/ (cherry picked from commit b2c48aa4d19268610191a0b7d7b76d01d28b0a13) --- sys/dev/vmd/vmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index 5ed5551d52d7..395b789fdff4 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -437,7 +437,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ if (*rid == 0) return (NULL); return (bus_generic_alloc_resource(dev, child, type, rid, @@ -465,7 +465,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, pcib_child_name(child)); break; default: - /* VMD harwdare does not support I/O ports. */ + /* VMD hardware does not support I/O ports. */ return (NULL); } rman_set_rid(res, *rid); @@ -500,7 +500,7 @@ static int vmd_route_interrupt(device_t dev, device_t child, int pin) { - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ return (PCI_INVALID_IRQ); } From nobody Thu Jan 25 06:48:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHC3HsDz57tqs; Thu, 25 Jan 2024 06:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHC1gNhz4kvS; Thu, 25 Jan 2024 06:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BEtfmJB3RGLeCN7dzOS3FYBzF6P7FF2HIcn7w9EHH4E=; b=uTtwJhxYVqUfqYQJRnI0pZ+KQ8Rc2PA+Q1DhiGL6cr8TFi7MWzau7CYA64RPhx6Rt7WTAH mb+/TY2TKxgQpRwTVuwwyFCFA5W+w6iJg2DohJo1At0LTNIepqxEcs6bMqqOa6Lv4zUipm jumQ3zexWMdyQB6lQNEJt0UQWOnEC4SnrEKdOUG270gqirX0cqpbC86b4u7JjkMvJZ3kOL KzLaQIjyWKOoyp+ed6yy+hYcS0WAuvp8I5n1g3pmFZiqGM97pTYzc8P97jGEs0nTQDZPsP Evzw8CtdpkJ3CNJCqf9UK3CNYF/GlldYOKiMByD44fu6OsE7GxJjkNkJ9DEyJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BEtfmJB3RGLeCN7dzOS3FYBzF6P7FF2HIcn7w9EHH4E=; b=HE9iuaZQxZAtvz8h8u94+rVOIVkMvBLOkZvzw2lZ7IVTJDBwgprYAgr4xC/PlN8BetH/Hs 2CNwc1bSweTijRTGJic7nP/9Ylt6jQRU9E1+WSfrOH4NtDT2ZOFfK8wRcjjIDy9eOOLLFU 0yQ8rH3MuOux6n1v2kRkElWLEPlI3FU1v5j+0bsry9v8Rzd5PYTjr5F7/yKSOxKxtvjdVA olF7OP+HDEOWljL26o4obne1lnvYV2di2WiHF4q+LmHib+qjW3uNyLUSOlTectpKN/wW90 pQ3CsL/GOvgWb6qjVwqYUALEMR5a1Hypd9bmji/4OONTLUY5QYivwvmsl4mbLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165303; a=rsa-sha256; cv=none; b=EcpCxye2vVUuCm4aaRqEDiSfOwTRPo/9y17bLzDg2t7BfF9tOuTPQNHgke4AvX6Y5wLUg7 SJpy+TbnW0CdXJj08IeE+XYQvcC64MFZxiT3yzovJD52DtA70mX8kvXJ82V8gG7Nqfg9ey 2haNbhfZRYdR2ljqtx6s+Kqik1vWsO7GOa4v8QldM17Y8xB7x3qY0gtqhPKyGoqpoAGy6Z bhLh3r7rNm9q+S7L4np/JBirp9xf/nr2E3P8j37U5e1yzJTiGsBrZW06f2+8n6yWjogQlV hA7+u6baQ5X/XlZPkMCTO5nIOpP5Clcx3QJN0uVFh83yvwz4Qvn2WR0JjxdTCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHC0nS5zn72; Thu, 25 Jan 2024 06:48: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 40P6mNwZ016906; Thu, 25 Jan 2024 06:48:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mNAO016903; Thu, 25 Jan 2024 06:48:23 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:23 GMT Message-Id: <202401250648.40P6mNAO016903@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: 7924b5f36bef - stable/14 - usb: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 7924b5f36bef227a253ad2b312148ae6f9b21a79 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7924b5f36bef227a253ad2b312148ae6f9b21a79 commit 7924b5f36bef227a253ad2b312148ae6f9b21a79 Author: Gordon Bergling AuthorDate: 2024-01-22 20:57:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:45:09 +0000 usb: Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit d743711016298046ca77c5661bab41739396a180) --- sys/dev/usb/serial/umcs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/serial/umcs.h b/sys/dev/usb/serial/umcs.h index c8c6135710cf..0d34c54a3707 100644 --- a/sys/dev/usb/serial/umcs.h +++ b/sys/dev/usb/serial/umcs.h @@ -169,7 +169,7 @@ #define MCS7840_DEV_SPx_LOOP_PIPES 0x01 /* Loop Bulk-Out FIFO to the * Bulk-In FIFO, default = 0 */ #define MCS7840_DEV_SPx_SKIP_ERR_DATA 0x02 /* Drop data bytes from UART, - * which were recevied with + * which were received with * errors, default = 0 */ #define MCS7840_DEV_SPx_RESET_OUT_FIFO 0x04 /* Reset Bulk-Out FIFO */ #define MCS7840_DEV_SPx_RESET_IN_FIFO 0x08 /* Reset Bulk-In FIFO */ From nobody Thu Jan 25 06:48:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHD4z6Rz57tt1; Thu, 25 Jan 2024 06:48: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 4TLBHD2k6Rz4l1K; Thu, 25 Jan 2024 06:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZ8iunFsTWW4FYIgXpSs6qkPXT4i5sL2imoNUGbbeLo=; b=WMiMa41zZXaYnEI80isU+7hQ3gNHx9KuEkuYU/hW+hpDHprWiYcQG/4DSE4ex+Cz4KfpPI M5rgygx6bsTXEbgd2K1BoZDm6OypvC2W/s3EAmS7CwjrDWovkM3V2A/2c1Nalj/E5qJHVq uT9EFvrkMJECzyuhaeEDbceuxqr1vJXIRj9xxJn0uKF+vG51jNo1hAOXzth83AoW3ZAKB7 Jz66j4VUrwKocY/ZCG8imo/mCPyyRBq7BGTRGRn/NwK/ROqMa/Kx3l56mmMHmckrmm72BB Yn3/ZWITUkgJdhXEeFdbZD7xzWKnBP9QlpQylN+OlEtfgrGsMsqrWqpDDx7+sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZ8iunFsTWW4FYIgXpSs6qkPXT4i5sL2imoNUGbbeLo=; b=o/8XQlDbFOuIlhejMWesJfaGl9vUdCta1QmIxs9F0ELjBooGRomsapL28M1R1fiKCF4c3X YyKLo3DWryfnYk8VBq+lqaQKx9/RDUFqy0kF7ArfnQizOqmRwuT88xi0L3gw30bRwgrYIG MX2MReTQxhSebEB4QIRhYrscksAMPGIZjl6J/pu6YTEf4c7PIJ3VCyP6kSAliD92gT81MF gifFpmztWmHjSxUVnG6WjRsZyaWRE2qUVMZHmCfuLcDMFfmoHGza6bysCb6Hl+uao5mzpD pMl3+x7g3Yg2JRT267EmB8GkJdQiwKSCBrvwFdiTM7ZrBn5NgSDrxGHVbeQCNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165304; a=rsa-sha256; cv=none; b=QiZn0XLrxAPWfNJBiMAT45Sj6DyWmuEjrJCVXS7h6VXQvFtiY2dp1HWR3RVUbvgSqFs47f K9mmHd/SyTO+m6tuNSGrYLzQFyvrHV+AxBHNGBWQFYrNcE/KXhgzpCs3I/JdcOpbIBrdeW CI4ZDVFZGgP9o4LAo4mGtkCu8e5b79s2H1pzJROIyrNcax6mfI4pJejgUWSSstYwikjR4x 9Eps0MVfYZaw+ohnvuH3wCk/2o0fty54vDPCpvJQUT6Vcj1upBKgQJq8+EQ2WQGr/1Bxgp J6sz7gmpGzUKPNCs2hTmCnKV75SNZhHY5g6bupu45RpukdnA0aE2+0i3QHF8Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHD1qVPznkK; Thu, 25 Jan 2024 06:48: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 40P6mOp4016960; Thu, 25 Jan 2024 06:48:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mOEo016957; Thu, 25 Jan 2024 06:48:24 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:24 GMT Message-Id: <202401250648.40P6mOEo016957@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: 8ec7f15c1d7a - stable/14 - bootpd(8): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 8ec7f15c1d7a129ecbc16d2a46d4f76a03087aa1 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8ec7f15c1d7a129ecbc16d2a46d4f76a03087aa1 commit 8ec7f15c1d7a129ecbc16d2a46d4f76a03087aa1 Author: Gordon Bergling AuthorDate: 2024-01-22 20:46:31 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:45:24 +0000 bootpd(8): Fix a typo in a source code comment - s/adddress/address/ (cherry picked from commit d04df664776b436f712051520d48f84be93ab269) --- libexec/bootpd/dumptab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c index 3961cb4210cb..9b839c26c5b9 100644 --- a/libexec/bootpd/dumptab.c +++ b/libexec/bootpd/dumptab.c @@ -323,7 +323,7 @@ dump_generic(FILE *fp, struct shared_bindata *generic) * * The addresses are printed in standard ASCII "dot" notation and separated * from one another by a single space. A single leading space is also - * printed before the first adddress. + * printed before the first address. * * Null lists produce no output (and no error). */ From nobody Thu Jan 25 06:48:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHF4LWFz57tt2; Thu, 25 Jan 2024 06:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHF3VPmz4kw6; Thu, 25 Jan 2024 06:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l1VGc+BqZk1sOblDxAIHAzSHok2302Z9HlLy2QfwCDw=; b=CQavpxyzVnmHaw/RwjF3bjoASoKTb3DrMTo15NjibkMlXxN7LbA9bG3dXqA9G+9eVnTISw Skzu3u/MhN8s6zxsOAnbnBowj65mPCyQtDoOb7h1UpICgq+mhKrduMIjgwwn1SXdOzNl2O auY1lknaC2NjGU8JeGghmIOVB8iSDFnix0y2jAGtJp0w8XZmxVSQI7N6Be1G37gKDiEM4L YY8xtZ9fWB9MEfFqYxwJ32Eq8NJ4rtRS8zVqanW5GK32H5ukarerqvOe+zoT6vIXRtxbXi 7kQke6rhlcJDOcIGiFfEuitG1OrjEko9nxJGPofh7CRrTnEWhSMpwVGYLYxnNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l1VGc+BqZk1sOblDxAIHAzSHok2302Z9HlLy2QfwCDw=; b=CyD6Vh6chLVVc9g7/tAtXrkglGjAACYGBgQhdQEn+gY/2GuwiWL8JquUpoK0Mv7sZGni/7 D/GWlpO+KD2yaa9Am62WT/79f1GhcUwSERJt7KF892Lq5j+345BCnoXWfYPTXkz54d8dP6 0ClMHUqMqYWzkGc13S1K0l6cU7j9JsZMJEGuqMX6igYWcBE4pVs6uS3PUOM712Kg/ffA6p gyVk34it8UMdrmDjduT8AgIJzFC7UR0Ls1SOEsM/el8un8UWB9AnkRNGsY3igvmpN39l6r HyKrPJR7jDjIraWZs94D9RwKRdM3vA0txjJQ7EBsXeuyEwqPG2LbjbmWadO8yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165305; a=rsa-sha256; cv=none; b=I62CWPPWEju6VUKEGe3TowGhkJcOiSnh+MeG85kunA9eV9q17QKJ3siML0BXPoVN+NDfFB 5YTpJRYDDk+h6Hq/9HAcZMIUVpHAs31W5qElhkfgMka+xW7MMFX6t2AFDpEgZvw7srbN+8 5t6hVoLWuaODv3UhtqafdS2t/d6WvfJyBDNEgNh89O4v8V4QggopFcnCrtaPJUy+hFI+Kq vUpwkDY9oSta1YXVRX5Q7coGeCQuUYAInvw2iFZsMOU5e50xB9OSwNrFKRA34CZpv72tfV nFa7JBLczpRfFeK6UkNg8O9exlAw77kcQVqfXBTn0UYN0OJfcDlMFAX/uTTx0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHF2chZznlv; Thu, 25 Jan 2024 06:48: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 40P6mPrf017011; Thu, 25 Jan 2024 06:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mPDX017008; Thu, 25 Jan 2024 06:48:25 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:25 GMT Message-Id: <202401250648.40P6mPDX017008@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: bddcc06e70a3 - stable/14 - bce(4): Fix a typo in a kernel message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: bddcc06e70a341b1ac33f4d92f8d6950ca247fc2 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bddcc06e70a341b1ac33f4d92f8d6950ca247fc2 commit bddcc06e70a341b1ac33f4d92f8d6950ca247fc2 Author: Gordon Bergling AuthorDate: 2024-01-20 19:10:21 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:45:37 +0000 bce(4): Fix a typo in a kernel message - s/adddress/address/ (cherry picked from commit e1c0d368d630cce01691e1967ada9f36d6b8c751) --- sys/dev/bce/if_bce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 53b503ab2fc8..33158b75486c 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -10661,7 +10661,7 @@ bce_dump_driver_state(struct bce_softc *sc) val_hi = BCE_ADDR_HI(sc->tx_bd_chain); val_lo = BCE_ADDR_LO(sc->tx_bd_chain); BCE_PRINTF("0x%08X:%08X - (sc->tx_bd_chain) tx_bd chain " - "virtual adddress\n", val_hi, val_lo); + "virtual address\n", val_hi, val_lo); val_hi = BCE_ADDR_HI(sc->rx_bd_chain); val_lo = BCE_ADDR_LO(sc->rx_bd_chain); From nobody Thu Jan 25 06:48:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHH09RLz57tWY; Thu, 25 Jan 2024 06:48: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 4TLBHG585cz4kqZ; Thu, 25 Jan 2024 06:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ji0+EnAX1DSx02voIcsqG8bubfqEj4xq7TvWriY7Ak=; b=M0qz5KLd0EedS1YcFYzm+THi8a/O7okGUP/rL1cbX1XwJocQvWpqiWQGquUCjlM1LOTjFl 4HkvFVqdXPfrPy2x9dPXejTFPvz6nSnWanlsIxQDh+5r2/msGLfrBo6LBSIcDEPaCb4UnA Of9gx3M9Z1D/GQAnVH8h3y/LKuiPGOgXrILSbw24A9q+zx1O82Kq2dRyHQU7DOSdBfQFLO CHm+TJ/QPgJutc6nmQLpcxg63cpy6ped8Wtw+cVb3Z0j9XcdPc/j6ZPHzOWA1dFL+rd5ZG wyfafBqjYMRXaiXVh9vdW7Z+3K1iJBhwABY6bZENHqgrJEDostFZ8Ndhg5a8HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ji0+EnAX1DSx02voIcsqG8bubfqEj4xq7TvWriY7Ak=; b=BNZbKFUgXS7HupaUwXlX6RfB60e/fsw1eVZFovXsYStlFhpxAjYPRqqfM+MpEPTB30JCZ3 t0BSsDec0vC6M/VwK1m4kKfVLp/8ehV6FLNTCvSsnUvQzwIAu1kBe8HpOPvRR8j9cg35lq FKVV6sBjHy5mX/aEzgLg/CV7MwU7Ej3J1+l6kKNgKTa19NqiFGOkkMw1gzMVjz5La00SFL BxawdCSLopnlCv8gmVE/5Eq1T8fy9+nx2m30fVoZJHlER2O/+GRLbYuMFUgKav0ViFcNV7 h7hMvmQbWFxp2I8kXU68MH/9qXUf+N/VsYqsDSuOi0yvT0h+zHNiO39ijFspdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165306; a=rsa-sha256; cv=none; b=X9IQvjLhlJ38+I8kqVxZGtKwIIMWW/dGUti2A1E/c0S9aJSGnQqLmVc8U1pTfoQVMQYO1X gWCaeldvnAul0j1HtFPnFYbaTrNpo1TcpAXn4iTYvonZpxmEM3XdTn9OsSwpc7wurjvZuC ooSkdzC4+6hd8nQaDv3IJzkhYDP1MqxwxH5iJJ9ep7HTHmFqmVusOe/4Q35j+pJPr6TayN c/NnVXML6itjwbM06NFjKOz453pFyH9joWsvP9SYxIAJUI95JWSL3vF2AyItms/aAlpN3w MLy5p4JayccDPNKWrwktBwyY6zohmQ8nwVtEdL972OiNQMVY/qB1Ebp7vcYifA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHG3vqZzn8Y; Thu, 25 Jan 2024 06:48: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 40P6mQJ2017062; Thu, 25 Jan 2024 06:48:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mQZ5017059; Thu, 25 Jan 2024 06:48:26 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:26 GMT Message-Id: <202401250648.40P6mQZ5017059@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: 91e79edae637 - stable/14 - aic7xxx: Fix a typo in a kernel message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 91e79edae637ccd3c907adeb663c56f76ab82a56 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=91e79edae637ccd3c907adeb663c56f76ab82a56 commit 91e79edae637ccd3c907adeb663c56f76ab82a56 Author: Gordon Bergling AuthorDate: 2024-01-20 21:01:10 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:45:52 +0000 aic7xxx: Fix a typo in a kernel message - s/recevied/received/ (cherry picked from commit 54e047b13baaa5eb613e98991f807e7b6f893f78) --- sys/dev/aic7xxx/aic7xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index ea80c9d0602f..4b62f76b9cf8 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -1109,7 +1109,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat) printf("\tCRC Value Mismatch\n"); if ((sstat2 & CRCENDERR) != 0) printf("\tNo terminal CRC packet " - "recevied\n"); + "received\n"); if ((sstat2 & CRCREQERR) != 0) printf("\tIllegal CRC packet " "request\n"); From nobody Thu Jan 25 06:48:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHH6qYtz57twT; Thu, 25 Jan 2024 06:48: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 4TLBHH5wdFz4l26; Thu, 25 Jan 2024 06:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHJspHtVAze9PY/CJ48K0cY4HY4aa2X8afdUzi9r2p8=; b=DeqcOJ6f0RDISSM66V/X0B7IOitgEPfOAz3kco+xhFVb6iui1ReHOmRNN698/kuNBgjkTc KHRBYVHFNbzg1WS3k1NK8AWRuD/54UWE94XVoZG/KEyN2SH2YwolL96q3GG1LwFSDXmLss Fu0uWi0dJTeY8sWjU9sYS1jpUsAMzks2t0bHvW1KmkSriDR+156lzwkQYvYQ9DdrblyBbg TJUjF85uyYKxLBl7u5r5wy1ux2LJ4GYpRI9gD0hgGlyEbaPGkVftX8sq8VJYjfyAU9NrJ+ I9D4E9GI3rbrKX4ylybDpZ6sh/Xe18seai61cO33lhKt6ucU1M9ej3YhQJD9Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHJspHtVAze9PY/CJ48K0cY4HY4aa2X8afdUzi9r2p8=; b=J3c46uFLGDv9VDPHOzWP4X8Woo+a0iVehD0fey0tmShmJnBmXIBLk1G34GV5bNHioQtxyk WZDnCVjEZjfhq6k8cmUwFqlMdSIQujuXob6Q9LbibH2dd0T94Fu4odsjIdMtLSJhJPMt8H DAbZDnp+tI8bwv5POzgreG5XWJnUuBWmqi1os9geCrCflDv9Rxg0urOFNHRXPyI7uIrAiy S3E7jYW1Ml9CKYTdGOwHN0KpRbmzCwJTDO9E327j4RbAMHbv44XXzTFEuIS/tERwgRXUP5 I2Cj843f2IQ002M0r8DIzuowkOYhCgFAPYAo2minvSnke8SQdBwojzNlwjge0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165307; a=rsa-sha256; cv=none; b=qCjwUTahxRw9yE/RODFgo7OZoipBLnVCvzzUy3ReRkmbzNuul8KMOSY+hVv9JkTkFJ41Iu ooswmB9hbMjogm/PxVXW4SDRSgwjpga2qfvl+Q5yy1oQ10krWYCXmLDU62yyWP6Mt8m0hE NIu1cBl3W/EiZnApaYaVyFIlfaSjjSF8hOj79gVrux8IuHD5ZrHzkmL5vrhj/ES+Phe71W 3mLxwpAAaEB5ZAfWYldGQi6jbdi6Y2CX8U+eWsflE/K2/8OQCp3TxD/0v1ukPXClwGUHDo VZ+nGRWv9+Tyu8htUEynd3/uk4swupaLt3RjvFayNuX8aI0VviZCmhWsJJ/PoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHH52JrznkL; Thu, 25 Jan 2024 06:48:27 +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 40P6mRbP017119; Thu, 25 Jan 2024 06:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mRir017116; Thu, 25 Jan 2024 06:48:27 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:27 GMT Message-Id: <202401250648.40P6mRir017116@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: 550922c2720a - stable/14 - netpfil: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 550922c2720a4a9cb5a2ea38b9bd8b0a75f9f315 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=550922c2720a4a9cb5a2ea38b9bd8b0a75f9f315 commit 550922c2720a4a9cb5a2ea38b9bd8b0a75f9f315 Author: Gordon Bergling AuthorDate: 2024-01-22 20:50:57 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:46:06 +0000 netpfil: Fix a typo in a source code comment - s/strucutre/structure/ (cherry picked from commit cde9ec6a451d22ad65fbe602dc57135177c0a865) --- sys/netpfil/ipfilter/netinet/ip_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_pool.c b/sys/netpfil/ipfilter/netinet/ip_pool.c index 99394232fc2f..22f687d3a4fe 100644 --- a/sys/netpfil/ipfilter/netinet/ip_pool.c +++ b/sys/netpfil/ipfilter/netinet/ip_pool.c @@ -1098,7 +1098,7 @@ ipf_pool_flush(ipf_main_softc_t *softc, void *arg, iplookupflush_t *fp) /* ipo(I) - pointer to pool structure */ /* Locks: WRITE(ipf_poolrw) or WRITE(ipf_global) */ /* */ -/* Deletes the pool strucutre passed in from the list of pools and deletes */ +/* Deletes the pool structure passed in from the list of pools and deletes */ /* all of the address information stored in it, including any tree data */ /* structures also allocated. */ /* */ From nobody Thu Jan 25 06:48:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHK2XpZz57tlq; Thu, 25 Jan 2024 06:48: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 4TLBHJ6t1Nz4kws; Thu, 25 Jan 2024 06:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NEsl0I4TiLTWIg+59m2fAeh7r0KDpsaGv4juMvHmzkM=; b=Ibd3If9EHU7v3X+cNo+wWxnL0Kn27xkm1ubmM9U57cIHNRiKdts+Sb2tt7Rz0QjaQeI/DH X8sj7LkmpvD6lXsUjensAwk78liH3nbQvVZYU/uTliVwzbXBPOLnjhAVNS0XAwp3C78lx/ qG8au/suxPmWuEsfQDh9DslmKaprXXBva9vZv93qEaz22SgW6gsEWo43ffyzccc+3efMbz 1A/g5CQciemQDCC6pIg9UEZ0uEGrY3Va0FAZfkiZzhXNG9HlqJTkb9du/mYhUormNuiSAc v9eFwaAKIacQ6pMDrQ91tS8AaZKy8/k8yT0ERr2Fxidvxxx0l07THt85tEuzBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NEsl0I4TiLTWIg+59m2fAeh7r0KDpsaGv4juMvHmzkM=; b=XzXa7gyeA3LeDeeCjrJ4nj32+Zj0ss3m3j570sJY5xvHn9ewXLgJzfdmFd3DKZLzU+r8dQ 7kven/S9hn7lsNmUqeJmpf41Ml5rU9OLlGd+/Zphbz2ul+XbjBfqoiFyGtbbL7MghT1oZ4 b8/vV5lo/+O+7grfD++B6fPkbMlbWpdT11PEL0Id7sCClFZLihNPQB2T2bSQcCg/DnLkEm UY4tTjVrgb/Ax8nsv7f+Xjyxr/4TWEfDtk0mFNnhxNLmQbN+kBXNZ3vXe87coCOcmLXhgE G40o6MNbyvtI7ykq6ptKppcxGj4HDynNItUrnUU7BbbIr3aPX6rugDlnsbQW9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165309; a=rsa-sha256; cv=none; b=KMj1WxymCqs+7poXmkNijZB/6orcqRREhM39pDkY634FCelwwnSTh1R/+5yF2Lew+EXlzK 0CE4U/stELhC5sWCYsSWdbQx8e3DFrftFsbuRX1UvQNfnL/Qs1cVNYvHn/Q9rkk99hnW2R ZS0HBD7EJb2ul/OaHNfuhlhemBfBVBdLD+GFCjKIdCDqgh/myd7k4IxD0VvEHlGO+iCttt qTBtQ0hu4nUT7jTSvWLtHqmDWXJr0ASrzMwNMRdsq529+OqR8irmiSvbjPKYlkoHIK60W0 hgwW/GEyfrO3QQcN6ctLVxcPeYHNTqlqWknkE9buZFMnqsXrMyyWD1vdSELECA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHJ60CHzn73; Thu, 25 Jan 2024 06:48: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 40P6mSxo017176; Thu, 25 Jan 2024 06:48:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mSZp017173; Thu, 25 Jan 2024 06:48:28 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:28 GMT Message-Id: <202401250648.40P6mSZp017173@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: 2d631cf51387 - stable/14 - fusefs(5): Fix a typo in a SDT probe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2d631cf513878b15aab430b5813102d063584f2f Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2d631cf513878b15aab430b5813102d063584f2f commit 2d631cf513878b15aab430b5813102d063584f2f Author: Gordon Bergling AuthorDate: 2024-01-20 16:24:22 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:46:20 +0000 fusefs(5): Fix a typo in a SDT probe - s/userpace/userspace/ (cherry picked from commit 6f0da017c973f40c1bc70552c922c500a0a8c858) --- sys/fs/fuse/fuse_internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index 49b0659a4826..e2351e4ac24a 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -997,7 +997,7 @@ fuse_internal_init_callback(struct fuse_ticket *tick, struct uio *uio) * But there would be little payoff. */ SDT_PROBE2(fusefs, , internal, trace, 1, - "userpace version too low"); + "userspace version too low"); err = EPROTONOSUPPORT; goto out; } From nobody Thu Jan 25 06:48:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHL1xPQz57v0F; Thu, 25 Jan 2024 06:48: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 4TLBHL0rqFz4lFG; Thu, 25 Jan 2024 06:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMl2mO1kC+8Aflv/tdjIVZz/n5vVP32FUzbotjPzIp4=; b=t8shVt7vPY5xqZoQz1vOs0GzptQrPK5U6obKM9hMG51C+Nd0z4ajtlcjONjmd1muDgPJqy ChgIdR6E2XBp5Kn0yRXj62nJJdWe3PH7fAt3lmELVbjphIiv4aFXmbGcBEtK4lh8gsw2LA Lod+vccbXbo21GRCjxSj24wEe7etsiGUJR5krMBPHb0tKWzGNir0vY+6inkpchDSIgg6ni aFqbOGZ4iBbUTy9UMj8TvrsN+jbH88M5ofvUwWRj9LCCRUgtAu7vivx44tOEYMOXznp6E5 LlXDfbVmHMmFW5j1NbWU9RPHq8/CmYJGoMhlTRWSqYyLONnu5n+w3mV4lMufkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMl2mO1kC+8Aflv/tdjIVZz/n5vVP32FUzbotjPzIp4=; b=JixUQWWzJoNF/5YgtkEHmDbubYtUIwWHU4RRV3mDd6XAX1hUdDymENtF0Fv92aT+1/8tNQ uHJ8KdLr1oUOittddmTQ9JnZUYGHmMZieCZLvUvEA/dNm67jo2c/tJyPO6RYhlhIw4/0UI E5ACuhaUWlBxQODlp3ELiT9kXxYLJuwxSZkUHwKtJCsEzA4Rt2KBS8eS5t6p0HGw5t2zyU oaP/8xiO/+/Te0AsFZ+Bo+gxTD85JwjcMzn8yG/XB8q4uHzJgI+znIG5iyTnWNQGSdij1F qWZqIU62zFuRAVeF5FF6yxvZGRkAC8StiKn+eZmogb3D/8Vx5j8eu4PNiJ1KsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165310; a=rsa-sha256; cv=none; b=JiBnR8i2SxpUKL0XNjkhUaPwAS45yqimOsemRIhy4hJQI9LG/8RcH8HO8ujcKiO/XWprLn fclMXPWn/MwuNv7AHpZJ/HvELj6ysxFES0o7HM+5R13wFY1fj29qbDzqg7t0zAJ9Cv4u49 KYgyrooMBAtemyHZxTcRlCSIkRr1lA1cSj7uj9Kq1ys+efqcoHldOFJFWb5+VCKrRqyugM PLcjF1Aqu4V25dHt+SXME2VksFU1b2dADA2gs4ZhV1pNkrakZKXmaSnEeYxo+gXc+5Y2LV iC7kCAtmM/c7cBru0UEVDUI8POtht8dlAL+f/JqNJ1sVeceElF1jzq9jwki7eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHK74kwzn74; Thu, 25 Jan 2024 06:48: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 40P6mT9Y017227; Thu, 25 Jan 2024 06:48:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mTvt017224; Thu, 25 Jan 2024 06:48:29 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:29 GMT Message-Id: <202401250648.40P6mTvt017224@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: a8dc27290f87 - stable/14 - netinet6: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a8dc27290f8704057673c14d160c53ba14144380 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a8dc27290f8704057673c14d160c53ba14144380 commit a8dc27290f8704057673c14d160c53ba14144380 Author: Gordon Bergling AuthorDate: 2024-01-22 20:48:34 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:46:35 +0000 netinet6: Fix two typos in source code comments - s/adddress/address/ (cherry picked from commit 496432f192165b8700da4b0ab8ebdd253002e265) --- sys/netinet6/nd6_nbr.c | 2 +- sys/netinet6/scope6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 7d89fcc4ee69..7b4fa7a8d8c9 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -262,7 +262,7 @@ nd6_ns_input(struct mbuf *m, int off, int icmp6len) } if (ifa == NULL) { /* - * We've got an NS packet, and we don't have that adddress + * We've got an NS packet, and we don't have that address * assigned for us. We MUST silently ignore it. * See RFC2461 7.2.3. */ diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index 73702d8b8039..968d42aeb498 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -526,7 +526,7 @@ in6_getscopezone(const struct ifnet *ifp, int scope) } /* - * Extracts scope from adddress @dst, stores cleared address + * Extracts scope from address @dst, stores cleared address * inside @dst and zone inside @scopeid */ void From nobody Thu Jan 25 06:48:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHN6Fbyz57v0K; Thu, 25 Jan 2024 06:48: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 4TLBHN2xHqz4lHl; Thu, 25 Jan 2024 06:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJEicodcN1ClIFYn604sNcfXutKRwpw/0FOgTHbeKDs=; b=Yf1biCx6NUGAZmqIHHCISQFIwMyX2R89E8u8DFUBrUDKC5sl247JEI+DuR9EDbKn4MIMkA 3rw8I0yPyEcMXGVr7FbxRXV80xjAHsC5ikWen1TD/kNDxsPqfLARj7g5JIlvOL8eB5xWng WkeCZHLcv8E6V11Qn3txZVsmjB1uM1r4VoI9qz0ZhPoZUpUbmSptYcgq/NJ++tOUlPdZ/H LK7F4l2ycN5KANRRBI9s1sgPE0TYBsbB8jK5o8Xwz448ORJ8nfH9qayLLm3N9hoJSazQcZ zrbncTlCvsSC20XAzavMZTl1Pa4X/fhKuzqJymUQPtY6aEI+l9pOHuvD73cBNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJEicodcN1ClIFYn604sNcfXutKRwpw/0FOgTHbeKDs=; b=foB0K3QiLD4EoyCZ8Lh7nyjq/OpSLHdXoSTXZJpghrtakVgKIG4VjI5NiGUC9CqOv0oQnj p4AhBT+kBEvj4QbL7B0YycwgXjLHiTOTcTk3zSTBJ8X/JVhknwl3Tx9viXMy8NGnAIaAxT M55wl06VOk37zmLelCHM3I5GDOLKnUo9/D4TaCU2Qr1imsZ4JheueC+9oKLdCifjSM5QtQ +F50dy6tcbbtqcXvHtqMUIwlQndhTvmFQ5g6Jm4E0FHLDGIpfYjWUIitoJPsJfEFJoNvuS MrOub3Ftr8xU0bJUjb7K5J7QBEDKuB3OY1rkuGGj/zmlumDJiLYn4HqRX9eQYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165312; a=rsa-sha256; cv=none; b=Q91ZBHdypWOd4BWsAk/0LqLzaQ4k4VVzdDr+bPKmeSOs526eh0PJC5PPRpea7wPTSQmJG5 inOTNVM4ehuPCj5IbP5BWgTrahVWBM3ktJCt8j73JrcrN7JKKvqd2OKCefgQEwJDONcion m0NEfBoKTuHKZ3NX1U7sqtPwZj1Z4a2s0xXE9s5JdDK71c+OnMSXB88QWnBLQFSC5n9Wyo EO8/0ROeaq+M1YxRe+pFSsjkRO1dpO87n848HMRL3GrAEQo3peaMBJ7B8m36nO8yfHLQnN /SdANAPwhAXMAIrxHqZB8LVSASYpXHDe/GGRCx9uaz3BE/pCp17+VhfXtTMh8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHN232RznkN; Thu, 25 Jan 2024 06:48: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 40P6mWKi017335; Thu, 25 Jan 2024 06:48:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mWbG017329; Thu, 25 Jan 2024 06:48:32 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:32 GMT Message-Id: <202401250648.40P6mWbG017329@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: 44784993a6fb - stable/14 - if_llatbl: Fix a typo in a KASSERT message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 44784993a6fb3bdc7654036080e3bdfe2c0668f0 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=44784993a6fb3bdc7654036080e3bdfe2c0668f0 commit 44784993a6fb3bdc7654036080e3bdfe2c0668f0 Author: Gordon Bergling AuthorDate: 2024-01-20 20:00:22 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:47:31 +0000 if_llatbl: Fix a typo in a KASSERT message - s/entires/entries/ (cherry picked from commit b4c94968d1bd1ffdd43976b0315e2b6c2b620ee2) --- sys/net/if_llatbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index ef4f27dbb00c..e79f781e7801 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -706,7 +706,7 @@ lltable_free(struct lltable *llt) llentry_free(lle); } - KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entires not 0: %d", + KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entries not 0: %d", __func__, llt, llt->llt_ifp->if_xname, llt->llt_entries)); llt->llt_free_tbl(llt); From nobody Thu Jan 25 06:48:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBHP6ZJpz57tr9; Thu, 25 Jan 2024 06:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBHP4S3xz4lLj; Thu, 25 Jan 2024 06:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05mddJLOfh/ybm3zhnuJstf09DHstsOoBJSbE9C7918=; b=EogWipV1gHHHhNiZ+5Erpg+DhtAhvbXj5yfm0AFJcuTFiTlsc9I0qL6VZFLzLYaXKq3OI1 I0xIQhZcjdhUp8ep5APwVKmhOAevr6EV7kAlhpnAzqt5smTfuhLRLcyPejZDzExyoiaqLQ YWWVbsuRESUHJy2wcWWHdb1adwf2OgZ1jyIxKjuEvnPZKL2TMHIJOx/gS+f75h52M3VHQr c5P6gjiQOVxRUfOhsWLL86KYw+sp9TEm+Fw3TwoA+Rl77A9fCVPkm5htD1vXC9dhi+Rid9 JdequkbiR9TpYvcYBjbqYyeKRTjl7sTcHJYKS2rxYJjbb+ZKpXm2Fkq7r/eoTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05mddJLOfh/ybm3zhnuJstf09DHstsOoBJSbE9C7918=; b=P3IKB/C6oFqGvaeqwpc8eWjbToETbgiygPDIsoRyuJa7HmxlUNeRh7bHZJHq0AeJjBE8Va MF0x7ad4BPrnCeaFynjjQyCeZK7Kse9aS35nIZwtWwXlGqfFMpy6hvRIGtRdgVuo78kgFq O8E7FSTC8SC7Z5E5KwdNISrrbzpJ/tZNxgq2zyxAMMeCWXw/Wq4ElaSnN7vGxWIesunniV a2NFHCGKbFfBrvB/1Z/+P09QGv+pVsyBQ7v+t3OjWiyoSryEUpbTpyrH7lQIBx4u7Qrtwu fvst2iQ4fiAf1rNHe9NVfe4UHu+9Dx9ezxmCyKcnNyvOAsppfUg9IDLBVdu9kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165313; a=rsa-sha256; cv=none; b=DQueVP2ylgZS+hAzZnG+TxlH58rcWWeB/cqhxSILV24ckSpXYCYNFngabjpzOeYH9qQ/cB AMi49Rs918jGyxOpUOr935AFOXYhWFRFMXe7L5WnCeLcqULHQ5rKpVilbu3PE/Y+ShgcLL beoDzC+DpJqkPByHQ3/aDkjH3Y5qaJhG7Tmxun1IPvFS4xGnVWYqz6G2ucyJTep1iZFSl9 kZ7N83O+Il7tYe0/HsygmA+c/fxfm80MPF7sBUSqWGbKOJf8jjIR00N5MWeFQGsLvkZkXD SjOlhc/N/jVKfqZFWTGxR1SGp53BZ2c63kYr/grcTKj+yy8CXz9kfNTS7Ejb4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBHP3WmbznRv; Thu, 25 Jan 2024 06:48: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 40P6mXYP017390; Thu, 25 Jan 2024 06:48:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6mX8s017387; Thu, 25 Jan 2024 06:48:33 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:48:33 GMT Message-Id: <202401250648.40P6mX8s017387@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: 777bac8888f3 - stable/14 - net80211: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 777bac8888f3b5d8392d94d8cc660f35c25a971e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=777bac8888f3b5d8392d94d8cc660f35c25a971e commit 777bac8888f3b5d8392d94d8cc660f35c25a971e Author: Gordon Bergling AuthorDate: 2024-01-22 20:54:36 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:47:45 +0000 net80211: Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit c1ada39783109c496fde853cc2fe32f31a8f7516) --- sys/net80211/ieee80211_hwmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_hwmp.c b/sys/net80211/ieee80211_hwmp.c index e743b7dfb6f4..1dea4ec30106 100644 --- a/sys/net80211/ieee80211_hwmp.c +++ b/sys/net80211/ieee80211_hwmp.c @@ -1398,7 +1398,7 @@ hwmp_recv_prep(struct ieee80211vap *vap, struct ieee80211_node *ni, /* * Check if we received a PREP w/ AE and store target external address. - * We may store target external address if recevied PREP w/ AE + * We may store target external address if received PREP w/ AE * and we are not final destination */ if (prep->prep_flags & IEEE80211_MESHPREP_FLAGS_AE) { From nobody Thu Jan 25 06:52:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNR1LnKz57vTp; Thu, 25 Jan 2024 06:52: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 4TLBNR0r2Dz4qch; Thu, 25 Jan 2024 06:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZIzIP/NarvUQq8S6+k6j4U0zAsrCWX91vRw/+Irrsw=; b=rJNzpZv543GRgaTE6F/Nt9TJMoPgWfc98+H8GJChkBhdQsOE7PuohbN37Evgh8rUpXA8s+ oy9weSN6bsyPhVN2f0ArLjuwx4lluLtizIEsyPHKTjOo3FcYxbNPhrnMU44Nhg/ieCPq7P k3kl407pCnJyVtmkWfSbMND6MhmsJbMfWaBUIr2gKjArZUCUW8kpY2FAZ43pfYW3lt6f+G UbLGzDG6OZBwEjHcedfFYwhYpexY33MNfII2ELOEb9RMC6H24lBnfCXcdc1Dt3EP5KCNxs O1OcrGbbHVNZUg0A6fRONwHi/l+E9+PSddvDsf2GFEcbPK1W8ZapwKRBXmaEpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZIzIP/NarvUQq8S6+k6j4U0zAsrCWX91vRw/+Irrsw=; b=FA6qJd6D0xI9qVfXnGYvEuWA29tOvWTwwbwq6QqUwz2kLaIkJsZoBZLokfifzsTNYnATgx tiRg35QuHULrvmqRMcjKT/e4Zm7wtVmmQrUcjOE9sB/TeMYM3UzsvD18wBUdsWaQ3KJaKk PpfbTT47casoxDwltma7WOQbdYDRhiuacwx8w37xGMccBr77h/0aM91HXjSflbiOuvE0Dy U64so7jmI5lK6wOz12kzAziOeT192Ourg4OcQBMzzEJVV9HheQdZpH3CqJ7rhR8hg5AxBR En/TE0M7KHiXyAvRc/2jQMnodOlQgX5H1i+Jgpt7Zxhr2t8y8ZtiYQJn/a5u1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165575; a=rsa-sha256; cv=none; b=lgv6ADmfX+QA0YWbPZbvXyLy+EUs/gTYbmg5fnqKrg+ffFsEuuQpxebbK78v3kDN81CS+4 ESOIAtSWgcQ127QwvglNukXvdG9aD2iL3wrNikqeUnYwVHE7z7/fuwjRS0S1xOdA1Ih+F+ okQa5HJT93UlmK5fgpty+dZFZcCPHkdshlIHBvhIrHZ5NErKVwbJVXdtPw0G81mlOlcxQZ XyfsGRJD1jXwVrbRidS1Tdz1DmCF7dLoBDtSRl7oyglASJ6oqlTTUhDenONolIE07Pq7HC FhOirQWVp5Vkwpsnno5rgHWOyQVBGAEZoQE4Lgm/QkPTFHH+lLqstrQlzkQwyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNQ6zGBznl7; Thu, 25 Jan 2024 06:52:54 +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 40P6qsNG033939; Thu, 25 Jan 2024 06:52:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6qsVI033936; Thu, 25 Jan 2024 06:52:54 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:54 GMT Message-Id: <202401250652.40P6qsVI033936@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: 651804251df0 - stable/13 - netlink(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 651804251df08aa8b307f8539eeb700788c08187 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=651804251df08aa8b307f8539eeb700788c08187 commit 651804251df08aa8b307f8539eeb700788c08187 Author: Gordon Bergling AuthorDate: 2024-01-22 20:52:16 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:04 +0000 netlink(4): Fix a typo in a source code comment - s/permament/permanent/ (cherry picked from commit c90f1ed104606f5a691ea2defc5711ca9d28fcc7) --- sys/netlink/route/neigh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/route/neigh.h b/sys/netlink/route/neigh.h index eacacc09711a..10bc3b93d16a 100644 --- a/sys/netlink/route/neigh.h +++ b/sys/netlink/route/neigh.h @@ -82,7 +82,7 @@ enum { #define NTF_PROXY 0x0008 /* proxy entry */ #define NTF_EXT_LEARNED 0x0010 /* not used */ #define NTF_OFFLOADED 0x0020 /* not used */ -#define NTF_STICKY 0x0040 /* permament entry */ +#define NTF_STICKY 0x0040 /* permanent entry */ #define NTF_ROUTER 0x0080 /* dst indicated itself as a router */ /* start of NDA_FLAGS_EXT */ #define NTF_EXT_MANAGED 0x0100 /* not used */ From nobody Thu Jan 25 06:52:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNS2lFCz57vTq; Thu, 25 Jan 2024 06:52: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 4TLBNS1mwBz4qJC; Thu, 25 Jan 2024 06:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3GsmAborporKhnngAxq4LttM/RhfN+Fq3Xqpe/f8UtU=; b=kX83Alr4RrS4Na38VWb8mksjzYUpa+T9DqcYOH+aracDhLtefkDScM2yu0ptbXQ9Ts97Ah SIVR8IVnY82nvRGWi0YISJw7xmjSDFWe5/N0pJ8mB5OusYKnUm88WnZYYv0hGKCfdHg4Q1 +hVZDclruj3AD/v9PJvYk/hLICrvS/KJk9Akfzz485SxrvdGo6hMHfkqQJ/ockP8DaLUeG 5iGquDEfyYhhUSEQOJ4/AdzFXtHA/TZvRAdstX8QKawuwnfSPL0UvZ0KilpurFqmVZb0ZH p95Xadin1DOJSftERQHgT3d5392K16XFGXRvey51Az/Za6T09wnRBWH0It3Ahg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3GsmAborporKhnngAxq4LttM/RhfN+Fq3Xqpe/f8UtU=; b=QXRUuwZWfz4ZEJZLJkCzDSFgiwUiFa0R8KCDX5oW4RsA0sjGuPSWJ4HhyusqP1jTTC8qjG y6wzLMu2NNBX/MukI+ylokPlkizyNdVUE3+7NH6Mm06vSj+D9BCZOvLZhtrS2+9wwNmHvY 0o1CJcH7VILWfLTvoUDqX1tJ4SUSSkUs0oEjNH/6d5e2VYDIGqrI+U+Dty5GFDumxo1mq9 ckakhH4BTRyPX7LoqSCSz7y3xcFIV20+EzW/sKoXcxpT+fJT9Avt+7Xc0fhTbpcWN/Hvvj ql7koCA92LJUq5ka/DNBQobTbehMNrm0wclo2zggFGUCQcqipDY8hgSwahMvJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165576; a=rsa-sha256; cv=none; b=NKfM/1mx0sSl0DK1GLVQ8AcMJrWJPBc10iz5myRtvYjm43/Yiihv4qWcYazJ82swTK54iz nYZOsVFr4ysIgX9jFP+VlzJCDPpLJPKgH2e/cbNTQ1ogWWgt1FZdjPLMBr/qRcW6RAggGK dSQn1o3hqgkih8Ntngr87lSG6eq3ZZQHcSNd+SnX6H1XhgJqEAG9IT2VS+j9ypyp9LKjMh k+S4afQSCcVGHDOj0Wx8qOOLV4gO9blP/7kBeXzdfAK2D9P4Kt1woJnNKhepu6hC2rDwPQ Vcw4uZ6wlA0/iZEnVIXzxrcLwmuvoT9VO/+vkOJAhIjr9jNvptbBCCJQ6RInxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNS0ssVzn94; Thu, 25 Jan 2024 06:52: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 40P6quaV033995; Thu, 25 Jan 2024 06:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6quDa033992; Thu, 25 Jan 2024 06:52:56 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:56 GMT Message-Id: <202401250652.40P6quDa033992@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: 8f94574e52b9 - stable/13 - gjournal(8): Fix a typo in a sysctl description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 8f94574e52b98f97d25a3f4992f7a89b61e33631 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8f94574e52b98f97d25a3f4992f7a89b61e33631 commit 8f94574e52b98f97d25a3f4992f7a89b61e33631 Author: Gordon Bergling AuthorDate: 2024-01-20 19:58:08 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:14 +0000 gjournal(8): Fix a typo in a sysctl description - s/entires/entries/ (cherry picked from commit 3fb6adb07915b6759892c937fe4ae8a07ed1a029) --- sys/geom/journal/g_journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 24a196215bb1..b0e8ead5c0cd 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -129,7 +129,7 @@ g_journal_record_entries_sysctl(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_kern_geom_journal, OID_AUTO, record_entries, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, g_journal_record_entries_sysctl, "I", - "Maximum number of entires in one journal record"); + "Maximum number of entries in one journal record"); SYSCTL_UINT(_kern_geom_journal, OID_AUTO, optimize, CTLFLAG_RW, &g_journal_do_optimize, 0, "Try to combine bios on flush and copy"); From nobody Thu Jan 25 06:52:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNT45MQz57twB; Thu, 25 Jan 2024 06:52: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 4TLBNT2rCsz4qZc; Thu, 25 Jan 2024 06:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DTg+Y7qGKeE48QQYUoQmdUf36Zg3uByHFXXQuJacQF0=; b=mU9n89LrWq6N6TKdD03PZNGiWyw+B6po8Rl4WQ/ylh9pzLSJw2G1o4s/XaFWhmOWPH6Tmo g1ybqsIS7DdYUvhxHU0ETdFSyjP7rggAw5QJAGgDB49DNL+brSA0T6PBLGvDZG4mVuHbii Upa2OcOru+0qLudzEfGV9Ns4QJlrr5PjB7BE/M51pSwaE3uvq0gF+vOiQLjvIaeb2juTXx IubaG42yyHuMPzua+Rx5jq9BubNQQRlIAuBn1OFuGcrcJc4d6dijevKD/ETkZcIRFgg78K ouxRGgtwGoVZwTovUavoTxu5IY1MjAv5oCT+ENL1EcXsbHx2eOczqfWjfuDaCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DTg+Y7qGKeE48QQYUoQmdUf36Zg3uByHFXXQuJacQF0=; b=ltsI44gKv4Ab4uRyxKCMx+MeLt72GSI13O3Yo6q8ft8TSUmJWphuh55P1AwhavqPT35b0V abjS4LIi9+qf6sJpUfXc/CUq8Fng/yO6YmHwz/rWQvkf9Ekf0bIsw7r7u/MBwa0xJ+GGN4 +Bq2eN4GmJWj3vnFjo1R+SAiWluS92njVuagQug5Fm3Z8uf44R0YrTx2AVboTzmNlHrxgN 0SeUVPIANc0SCTI5xQRtaGX/+vvlzhflgCmEyxRf52wpptZtqyxKVFcXNirdG9yonATVzM MhuLOcHuPliflMCxnUCvRk4nSgqZXwjgdJHtJK+byoBxjWJlIII5cTa5NdlIxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165577; a=rsa-sha256; cv=none; b=dI6AGGnsPSPJbHuBu3YS1Jov3C6jD+BLURfDqa37sOTRfFlRciVK+pDleH/5qKoevZrSC7 REcKlJrONQOERUN7iWAlKRoVJMfk6kBpylbA2ApyJz+Ca90mc++WdGmsnByPkooVL7sW2z dUCU9Fc1Y3AMPCdf3I+Xl8GIVGe3ndKCpaD+lB6k59K0z9z/Tu0vIMiB0MRs0iaw1dp+f+ t5isDqcF0tA0Rl+Mzfhc/hUC9nXmf4RKHLx/jMy7rI8lUOYRIW740U8RZ0qOMXhnKGTkrG /fnTDylJKK3qWnSsLZwTbfe7lvsLnecPRyj7a3vmvi+lZrSJ4Q+xXf7eEMTgUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNT1vPBznmd; Thu, 25 Jan 2024 06:52: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 40P6qvTu034049; Thu, 25 Jan 2024 06:52:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6qvdi034046; Thu, 25 Jan 2024 06:52:57 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:57 GMT Message-Id: <202401250652.40P6qvdi034046@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: 9b52af884c32 - stable/13 - virtio(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9b52af884c322f8c3e904d19017d5fe83c761269 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9b52af884c322f8c3e904d19017d5fe83c761269 commit 9b52af884c322f8c3e904d19017d5fe83c761269 Author: Gordon Bergling AuthorDate: 2024-01-22 20:59:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:26 +0000 virtio(4): Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit 97a4045aaf36079f54ee05a8cb314b8a90f20af8) --- sys/dev/virtio/network/virtio_net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index 0838950eec07..b22875713636 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -210,7 +210,7 @@ struct virtio_net_ctrl_mac { * Control link announce acknowledgement * * The command VIRTIO_NET_CTRL_ANNOUNCE_ACK is used to indicate that - * driver has recevied the notification; device would clear the + * driver has received the notification; device would clear the * VIRTIO_NET_S_ANNOUNCE bit in the status field after it receives * this command. */ From nobody Thu Jan 25 06:52:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNW1gVrz57vFc; Thu, 25 Jan 2024 06:52: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 4TLBNV60Hnz4qJp; Thu, 25 Jan 2024 06:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vSQeoInQPJNdE6DKapaKH4iYfm5pmlVtpXph0lPuOM=; b=Pf2JjKa0k2rZD4JYy3sUJlWCl43tp/4GsSow70TOUSIt5uG0gpByGcJWVrEbrMiuS075KS /sDkP0XXesogl9DiTgYcL7sIag4SQlmeeMg5ycajVDU00ifxXT90MAel0MFcgTvnWbRqhH XgaeBP28Z/EJhh1huuEguwjIfPHCq/mKr9ZnSMt4XW15Nj5wBhCjxCQN4yU5iwSQqBc3v/ 6cClfj4szL+WtWqzQyqr9y50f7ky90akHaXmXLD3Eq9c8c8rLYWH9UBw2z67QiRxicg+pa FMz+qeluGU57z2DfzgtwT1vCtho12iiZqdSkyTQS31MjQXHt1lgA5dTMwNN2eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vSQeoInQPJNdE6DKapaKH4iYfm5pmlVtpXph0lPuOM=; b=G26AxylyJ4Lg8Ua04Ag5YFaGihjXdvBTeiM6IkBaQPa+ceoP2ikrumrnQrgeh0/hzgr4Fk P3J2ee/cZiA+zmBzpmzQbSbAA4sspx0xNOUHWgXBgPyZXx1ct//0hHPe7+o5fEW/3xJRps OT6oJk27nIdZ2bMXD8OKXCIDNjOaHYo01idlzTHPwYnBBAzbWH2btirkjZzTZ2/53LfkPU JzRQQT6QD4VsbjFeDxuFTC65Ab04+hNYZN2lsZ8Iu5V2s6v+7dUwCgnt8rOpYSRxVwUQFu 7TkpQMoB4cIMSjTBtkTE+BTf5HUIaJ5DXwG72D7jv5N5ysbGF4oEcyr30LWFQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165578; a=rsa-sha256; cv=none; b=ApjzhAdEEwOTG6IAaInRpMaZGMaMJEFJtKn93WJD9IM/ulphJb2TDE6oJv0e5E2VgIykzy 1M2pmVdRn3DmT75DHiXex5k1hkeYxzQn3Zs6ZCnElDBBEP3c5zgTUGR9DiuGu964i9i9Cv 1k9hmfF7waMTWoKnMkzbeSvM7d5I8e7XfuP0rCiXdJjoVpX888dOXFGb7psyNVzfCqtAF1 noI+C+01eqK1he9ySknUorGMMofUzuyYTpejFQwZCxNtGI8Qm4KHQZp8aI07Ak9CgpFbf6 qjRSr1LPW69Oi4bz8FDy5szFecUmMHpc4YqFDpfH+im/XUw/30vULBTUE1JznQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNV2y68znPy; Thu, 25 Jan 2024 06:52: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 40P6qwWN034104; Thu, 25 Jan 2024 06:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6qwup034101; Thu, 25 Jan 2024 06:52:58 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:58 GMT Message-Id: <202401250652.40P6qwup034101@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: f2770534e26a - stable/13 - rtsock: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f2770534e26a1d70525b75deb00aa86b0d060b22 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f2770534e26a1d70525b75deb00aa86b0d060b22 commit f2770534e26a1d70525b75deb00aa86b0d060b22 Author: Gordon Bergling AuthorDate: 2024-01-22 20:53:21 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:39 +0000 rtsock: Fix a typo in a source code comment - s/adddress/address/ (cherry picked from commit ab6d773dbf926e4f92e37b67a85c3290cfb90723) --- sys/net/rtsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 4da7e9e74025..3d977cba4862 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -750,7 +750,7 @@ fill_addrinfo(struct rt_msghdr *rtm, int len, struct linear_buffer *lb, u_int fi /* * A host route through the loopback interface is - * installed for each interface adddress. In pre 8.0 + * installed for each interface address. In pre 8.0 * releases the interface address of a PPP link type * is not reachable locally. This behavior is fixed as * part of the new L2/L3 redesign and rewrite work. The From nobody Thu Jan 25 06:52:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNX0gw3z57vKw; Thu, 25 Jan 2024 06:53: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 4TLBNW4w0Bz4qpQ; Thu, 25 Jan 2024 06:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ha+J61sX+1Oh2ry5kL+FqyZqT+cGihJMGXDHt3OxKxA=; b=AIyo4F65JyST8VwJUCmXoDdbM+jCWvP1bXzERM4/N3CscvaydSvY/XidVoQa9nZx+qYtK5 OSgFAnGJ1wgTuKUyUX/RAbObQK+YOyslBP5dLZugzGrPMgm3Znld2pmmnMdWyQia4Hmby1 ptruUsdr2qKcw5n9IDYmuLWovi2mwg/QqjvOhs+QMtor54OU4Op5NjpDcsV6vkzt6CzUqx 2NR8C43HzODwCXx4Imh03XVIUq1Vr22J7q/IGjlO5RE8xPkjzIhGCT3vhb44kJTHMH+uKL v9VSTX8+If4jwsYxutvmxwN1oTa5atKEscS8S7od9XtKm4Gsivoof1lSFJFRHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ha+J61sX+1Oh2ry5kL+FqyZqT+cGihJMGXDHt3OxKxA=; b=rQOozvPomGiDGpHSiVydChBFvoRKOg/+B2QMQ4vkJ9aRJbJDE/51R1YzKxggRxuxp5t3wL Tf0l6ghN+kMc2PJrT38zl+/4k3iI4ySQFARPggiGVlrUC1RFmTjIwuXW9rHlCtdusPdPYQ Qv8ZGW4ePQ+PbFxfZ4dWrXis77QHCXsWX+aTIZapICU4qe3UZdUVrbrch0928Rtj/FDOkI rjYDuuhyDUzR1g+CGKcen+lL6gQX2hHAYMPM76+Hu8HhqM+E6UG1Nq/PKV+qyaCebIA3xn IgCeqWgizacjps0CfFomXb0QGpBJH1qdUbh6fA1sd84KB5/otyeXIxOetVLcnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165579; a=rsa-sha256; cv=none; b=bmD97RkcxFwKFtMJcYAwkRCHxvwY/U45yS7CF1zKssO3o/Iuvn+IHZ4E+qbNB4/NpKZK4B 1J2FLMlHNKTn23NIY1kMqZqX7CKVG8YwUnyff9Ari8QeVIdhAZRBmSF1gLzPzWs3R3GbrA uuXLmnyiItiC6NPiX3Leb7H41N4K41dcuRAgEKziOQjz0axH1I9Hevj3DKsSnd9oB7yh+9 Vxai5DS2ypU3AcKXt61sydV83AYPowGEfIggcPQQmmSeyx9vUGfjqYzlY7lhvhgRcRJfK1 Gyh1d6pkx/V/vAuM47v11P0Wn/dp7vqtBgXWxX0UTQqY1wJ/wX97tkyO3+ypXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNW41XvznQ0; Thu, 25 Jan 2024 06:52: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 40P6qxiv034155; Thu, 25 Jan 2024 06:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6qxXT034152; Thu, 25 Jan 2024 06:52:59 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:52:59 GMT Message-Id: <202401250652.40P6qxXT034152@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: 2ecf0a83b2dd - stable/13 - aic7xxx: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2ecf0a83b2ddfc680e5761b23f41cd32fe447533 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2ecf0a83b2ddfc680e5761b23f41cd32fe447533 commit 2ecf0a83b2ddfc680e5761b23f41cd32fe447533 Author: Gordon Bergling AuthorDate: 2024-01-22 20:47:23 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:49:51 +0000 aic7xxx: Fix two typos in source code comments - s/recevied/received/ (cherry picked from commit b971c51a4d9498c26079fd8229f7af6ef1585020) --- sys/dev/aic7xxx/aic79xx.seq | 2 +- sys/dev/aic7xxx/aic7xxx.seq | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq index 118c4f187486..85957102eb5e 100644 --- a/sys/dev/aic7xxx/aic79xx.seq +++ b/sys/dev/aic7xxx/aic79xx.seq @@ -1198,7 +1198,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq index 1ae250d880bf..a94e2dae4149 100644 --- a/sys/dev/aic7xxx/aic7xxx.seq +++ b/sys/dev/aic7xxx/aic7xxx.seq @@ -1639,7 +1639,7 @@ mesgin_complete: test SEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation; /* - * If we recevied good status but never successfully sent the + * If we received good status but never successfully sent the * cdb, abort the command. */ test SCB_SCSI_STATUS,0xff jnz complete_accepted; From nobody Thu Jan 25 06:53:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNZ1p9Rz57vcR; Thu, 25 Jan 2024 06:53: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 4TLBNY6zZTz4qkR; Thu, 25 Jan 2024 06:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jyi36jwC5mgFXfPszFVoh78gM3ME5pPscp00xkmcrkQ=; b=QA4pHWIEWD/35HfQbfimcQey+tScrcKB8ayCAaqmrrGmt1Ya6oQ39wTd3XNz4fqS1+hKG9 c+rVdaOkIKRD5tpfhFKc2TznQ3YjffZv3/DYnrtH3DoEB8wxSmFDqaKb5CqIPLkyOaI/Zd MRx8rMFz57/i7D+axg4vZ/8xFyKBBPFe/PVAR+tx9eu19czICe9zoySIx2Zru+QOjxPIgl TU42NmPer4IW8OXyQlTvmB3t7xVkGCR0qnuKzlC51hbu0toR+wsJiDm/wvv1nFj+/mD7ku klbuncMwyrbXKf2Z91Nby3HipT2pmlF57SUy2G1CLYf1L/ohHPCARvSWSq19zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jyi36jwC5mgFXfPszFVoh78gM3ME5pPscp00xkmcrkQ=; b=roXARzg8iEHZklR4zBA1OPygzGSo430vxLs9jWXIvslRb0KedN+UIKkqkiPJ3BzEElL06W kvlYZKgjfR6yeugSAOPtQOfjMO2nWujVo4/PTgCHTx4K5CSmfQmh+yXXIxkqu0JcStUdaJ vb90w9JV4TV19sddjz9uKfmgEkdqO5uoO+/WbGpVKnJS9c5bOMWnEh1NpHz6zAVeHlbIel AEkDjy31lBZEyCXfuJx1wMwB/a0CaaPgMqJcHLosCWqb0RvYL7+8VXgDhRJSfzORI7S1R+ 8g9n7ZkFoOzvJF030ympjYztz0I2mePLOBWEYiEKIBTrpiPD3FJK+WDM3BpWRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165582; a=rsa-sha256; cv=none; b=jq16ZjbuMH/pqZn6+0foe6VkMXmxoo9dVTyHEfR5GvcB72bt0Kw/blAR9tpHQm2AXlNGFq NAI61OHyQqTTd12JUaprYHgUw1OG7xVaVCSjnlqGSpxEDu2JzI6HRiQkIJHrWr7MzbXzLF fb426ej5TX1AKkjWZgWjVBid2p0htcCKabXZQJJp3j/C9D3TuP2tSSPiRnkhFvLspmOhmM yiPYugPCF0s+QJmmS1+a/xzV3qi7tht+zp4gSJaLSPHujQ7bp4VmoLZHwfMMFnA+2bSyNl sEs9AgvVYTZs/xNcVIPVvzqjikhWZFSwrQInV50My8q2Xfqdy3OB9D1SuE+lJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNY65SLznl8; Thu, 25 Jan 2024 06:53: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 40P6r1CI034270; Thu, 25 Jan 2024 06:53:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r1fS034267; Thu, 25 Jan 2024 06:53:01 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:01 GMT Message-Id: <202401250653.40P6r1fS034267@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: 48a02b429d58 - stable/13 - vmd(4): Fix typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 48a02b429d58868782005fc72c722d37deee300c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=48a02b429d58868782005fc72c722d37deee300c commit 48a02b429d58868782005fc72c722d37deee300c Author: Gordon Bergling AuthorDate: 2024-01-22 20:55:33 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:50:18 +0000 vmd(4): Fix typos in source code comments - s/harwdare/hardware/ (cherry picked from commit b2c48aa4d19268610191a0b7d7b76d01d28b0a13) --- sys/dev/vmd/vmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index 16edf45c2dea..e07f1de4983b 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -437,7 +437,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, switch (type) { case SYS_RES_IRQ: - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ if (*rid == 0) return (NULL); return (bus_generic_alloc_resource(dev, child, type, rid, @@ -465,7 +465,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, pcib_child_name(child)); break; default: - /* VMD harwdare does not support I/O ports. */ + /* VMD hardware does not support I/O ports. */ return (NULL); } rman_set_rid(res, *rid); @@ -500,7 +500,7 @@ static int vmd_route_interrupt(device_t dev, device_t child, int pin) { - /* VMD harwdare does not support legacy interrupts. */ + /* VMD hardware does not support legacy interrupts. */ return (PCI_INVALID_IRQ); } From nobody Thu Jan 25 06:53:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNY3Xd6z57twF; Thu, 25 Jan 2024 06:53: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 4TLBNX5z98z4qf0; Thu, 25 Jan 2024 06:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/7/FwxRozvGlbCmIuPI9hHOCqrFwCmMOVslo8PJlBk=; b=bUc8spVyosc1871usBLs90/dYzzo3w/LYpyzhrOf9sjiBAY0+bBWByvLbfroXkb9X63b/i Egsqz4TQ/SfbdR9Knh1SZEPMf51h+JyFiSvegr59QCGtlkii6SL68EeFp6YsLxS5WornMK znhLLMPmwEB4r0PSzyOOiPhQD+3qU2wVb/pb7CcR3pPbwMPzcY7wRdfld4I3Vcz/jPiQgr /mwizjwGeiZ8G3LuDvLH0mJAKS5LeZD0eg4wrZI6vGBWIRf/zzzyq5Wh0xrRGfF2wPj5eO DKL1BRfxLVGBknNjVkioH8urQ/ijB+vE2iO94U96zAd3AwT6hf96lAPJRgxXxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/7/FwxRozvGlbCmIuPI9hHOCqrFwCmMOVslo8PJlBk=; b=XqIZPG4VABE5/EtFgYN1F20Z3ovT0L6UQfvtvkMNgLTXfIquoF8JlEqRwhm8TgMCp9IdFp WkS/rzv6KTgQ8oOvXKi5GTwqTNR2x10YmF1yNrKmR3Ao8iLGNUU38RHgfqe1qdnrIaWZZV /Y6upDUztSJ9+MJ0ayk1cgNeP7gEY31SviqH1Ww3nFZMxXzC5c2FSzbVbV/6skxfQHPOXK bsELYQSHbESzBn6SOHvLies/gdZ2nBDe0AUtOFF70PU8c6t2A9LH6dfy36gtPS57ZWQN8E GATojaKlZz4kx0HQiFaVOWKATvVXoDKCMmiX9uM2oMD9SQV6uCjkJx8BJtnBXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165580; a=rsa-sha256; cv=none; b=BQ0eCO2X7fta+X7BC+cOQR1C4MhrqORaNQTDyqutqq70MGBnGfTLmINsmbAG9gkeJnFK+A iEz04BUrkzy7TqW9hZV7IxqFlugXdeZENn9MWcbakDnttcBXa6Q/QTfhnwg/WXhj438l4m lwYYxJf2XBN96u47zQzBt5MT7alEXMRIHONbgvumKUj7WCi2bDE62NH5Z6xZODvgbDXwzw 3+I2xu0OJHVXGSXixi3dYYdNVYtG+xA6d0rUp5J4j0R2fMPTwVSudfI3rFpEpJgqmg1EQd U7feafeEc9vOl0x22qgAdqEM3yvV6+cn0U7sl37CeM9GW+usxnuNVRdKglBicQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNX54hKzp14; Thu, 25 Jan 2024 06:53: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 40P6r0dr034216; Thu, 25 Jan 2024 06:53:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r0tE034213; Thu, 25 Jan 2024 06:53:00 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:00 GMT Message-Id: <202401250653.40P6r0tE034213@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: c940246eb0d1 - stable/13 - tcp_fastopen: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c940246eb0d193529bdbefc03c0cc0549e57d73a Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c940246eb0d193529bdbefc03c0cc0549e57d73a commit c940246eb0d193529bdbefc03c0cc0549e57d73a Author: Gordon Bergling AuthorDate: 2024-01-22 20:49:47 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:50:04 +0000 tcp_fastopen: Fix a typo in a source code comment - s/posession/possession/ (cherry picked from commit 9b035689f15fc4aec96f9c18c6c86bd615faed2f) --- sys/netinet/tcp_fastopen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index b72a8c852436..0ccc67de9979 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -43,7 +43,7 @@ * * In addition to the facilities defined in RFC7413, this implementation * supports a pre-shared key (PSK) mode of operation in which the TFO server - * requires the client to be in posession of a shared secret in order for + * requires the client to be in possession of a shared secret in order for * the client to be able to successfully open TFO connections with the * server. This is useful, for example, in environments where TFO servers * are exposed to both internal and external clients and only wish to allow From nobody Thu Jan 25 06:53:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNb2hYBz57vFg; Thu, 25 Jan 2024 06:53: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 4TLBNb0fS8z4qcF; Thu, 25 Jan 2024 06:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgo51k7tOopv2fJTdsxwazgYClxyU96Vi+jc+6ve6rI=; b=KzEg6PPWG86BcoP4HEJywoKFhS5rquifbenwnk25U8NjQ+qiyV8xNF1yje5B2aHZw1Nhp6 nqFB3uZ1UFxFi/3Q/FJfg0URTDxTg/yFQ8Ginrx42W76cxGCxf2+K8w4IdgOJqauRvFqxd QtN80dkA0RZYnLCj5kFJIeWD7A46vjQ1eoo8+ua/O4ETYKTVAJBjv+RSAQm4Z76fsNKKx4 VX6uMIUhfnHPQMYDQxK82LBtb+ymypN67fBb6t+Pj9wRRtdyMgeVl8Ro6S/IsN2zFa+xiy +FoaBJFwWJSkTCSlNckf13BnRgrg+dDBqIPHFx3U6KnhnJNjOrehidsmP6v/2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qgo51k7tOopv2fJTdsxwazgYClxyU96Vi+jc+6ve6rI=; b=xB/eVL0w1i4XVie6xHPPmKQxnSp/TEEncbLJ6U7sXNh1vKEaYqvRe/PFVwuFSvrj2GOf1C iVOH2sKeGf0f+qxMrHOcR0n2bd3AzIXLfY7oIKgYp0qB1sou2KUsbIsqNBxc2kv8PoNMao 8VJMRadoZ0eUYCzMeOZcdQ8Ki7B/Dd/WdgpetZuLvQ+XYxmrtYQ3/xlxlb5cBWtLF+Eta5 EjX6uR1tKQ9xoQawd7nJI6CeiknbSeENuY+NA5ipMl9Z1SQOjQJF/Lfn49Odz21QW5kltV HFUc+qp8AXdRIgQTphauTCR2bW2HMzw4H39JhiL/kbIoxL9O+UQJ0dSMkApsGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165583; a=rsa-sha256; cv=none; b=jppQmYLVcRHzF4K3KqQlbG/p0TAEg/fGZYvhC9o8T/fz2oplxdvU538KhuWb5Vijkx95/O tGq07CRi6c+QW9bayPXuvmMTFqDNwl7jlEWJ/rYEzM/Mi1zOLlrdnS/30ynIIJ0sBOdk0X 0CRtM79BpO6InVBmso44zlA7yKjBJqiBTTLM90KtxCNrK4iY33MzjM5hh20BjN7It05XS4 Qr+eIiMhVSv4u5IpnaoMpfgx/VinUxqN4ME2kRvUh1oz8uFt7KQW2CGxpdeE3pdBLnuRtE yOMywI7LgNSILlz5eGnRE7K728B0HYimXNqB6DhXD0Epej/BWfP2s/acIY3skQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNZ6tWdzp1c; Thu, 25 Jan 2024 06:53: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 40P6r2Ja034324; Thu, 25 Jan 2024 06:53:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r2Qc034321; Thu, 25 Jan 2024 06:53:02 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:02 GMT Message-Id: <202401250653.40P6r2Qc034321@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: e36e3f53d3d7 - stable/13 - usb: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e36e3f53d3d7b5570f51ceca0c6ccc64070e400b Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e36e3f53d3d7b5570f51ceca0c6ccc64070e400b commit e36e3f53d3d7b5570f51ceca0c6ccc64070e400b Author: Gordon Bergling AuthorDate: 2024-01-22 20:57:06 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:50:32 +0000 usb: Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit d743711016298046ca77c5661bab41739396a180) --- sys/dev/usb/serial/umcs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/serial/umcs.h b/sys/dev/usb/serial/umcs.h index c8c6135710cf..0d34c54a3707 100644 --- a/sys/dev/usb/serial/umcs.h +++ b/sys/dev/usb/serial/umcs.h @@ -169,7 +169,7 @@ #define MCS7840_DEV_SPx_LOOP_PIPES 0x01 /* Loop Bulk-Out FIFO to the * Bulk-In FIFO, default = 0 */ #define MCS7840_DEV_SPx_SKIP_ERR_DATA 0x02 /* Drop data bytes from UART, - * which were recevied with + * which were received with * errors, default = 0 */ #define MCS7840_DEV_SPx_RESET_OUT_FIFO 0x04 /* Reset Bulk-Out FIFO */ #define MCS7840_DEV_SPx_RESET_IN_FIFO 0x08 /* Reset Bulk-In FIFO */ From nobody Thu Jan 25 06:53:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNc4y5Gz57vCG; Thu, 25 Jan 2024 06:53: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 4TLBNc1y4Hz4qkn; Thu, 25 Jan 2024 06:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3j6v9DOTje9Zdlv1BHbOXzHoHaBhiaN3rpOPQuMGGw=; b=ccB59bsxDEd05PhRLgkl6vqfMsxFgepm4rxDv0ca+wBPBQyzwEt458svELFJQWS/RZfSBQ hyEz3nJ1wrmBeuix0XBSx07mqiiIB1INBI4ZhuBQvd+k4G/6m90/UgMEzuSCql9KGqiFKg 10dbm+tf/VQYhyDwC13i6JMcPn2VqFeidsU5CQGRjeFFxIriCfmYRiFf5430ndWzXCaJz+ yxkW9j/sOSnocgUoUesGS0+JIlYaNi/W8osKb4jt5WM+jY8QWE7Juc06v6WkcRDpGR2wJn ipB1cg9p8aSbrFMP9Lafs9EwTy3QCRvaIDlf5ozHWcXNszfBWd8v04xOHRbU3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3j6v9DOTje9Zdlv1BHbOXzHoHaBhiaN3rpOPQuMGGw=; b=X5y2I0zR7lojjB6r/H1SjhzUrewTMq2HVXSr8MvN3PGDj1ydBvQKIcqeQ16XckXUKF0UdU PnlC8bltaTYIacDFsvUPYE8NdUv+jgjPTXqnM2IzJ07Rfr3J+3Puotc03yyRF9gxR6NSL8 XBhpGHH4nKeb/4wWquOSLnBUO9PJ1aR7uFPa9jUosb+aCOiTkoTtgsS/tLirJN1+xYnhxp UrNr8pIZCq94DlAATwu35gHexoFrrUe0K46m73MPwkiuSRC2mSpP/8v11TwnUEFcHaph2W /GoBr6pdXNPHMdAtoIbA+gyOiKauEnSjjUjlRStKSagZbaQVgQmVu7Y2i8EIsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165584; a=rsa-sha256; cv=none; b=xWFMAyb0Nz3++WjtB9HIZ3Lb12NdHXtosPYkmL3bQHAd6cfZiBBjK7xDkELUfGwKQb4yl0 xXJEmByRzGh3czy4fwwztSRze2Ary0LCCFYuexfBZR6p3q5Q5MugG1fLr+16UPYSBc/W5i ZlBEV8dNtWtqXaSEoqGI0gkisbZ7AsMTvSVUd29g0q5L3uZuYwfzuGba+1brHJrgD+EPbx 9IY5tICRv3i4LvY2ZjXRBCnpnW0WZJeL6Y/urREmQBbtzxGEW3O+3KLua5fYRZh60Mng/j ApixWt+aQ1b2mPkKE8C0GQ+5pVWdN9s37pfnhNxnWrLqYWiX7oY9B4Q8IzkOzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNc142rzp15; Thu, 25 Jan 2024 06:53: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 40P6r48p034378; Thu, 25 Jan 2024 06:53:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r49K034375; Thu, 25 Jan 2024 06:53:04 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:04 GMT Message-Id: <202401250653.40P6r49K034375@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: 04866ffa491c - stable/13 - bootpd(8): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 04866ffa491cca6ed1cc0916965aaa5932d72b3b Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=04866ffa491cca6ed1cc0916965aaa5932d72b3b commit 04866ffa491cca6ed1cc0916965aaa5932d72b3b Author: Gordon Bergling AuthorDate: 2024-01-22 20:46:31 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:50:46 +0000 bootpd(8): Fix a typo in a source code comment - s/adddress/address/ (cherry picked from commit d04df664776b436f712051520d48f84be93ab269) --- libexec/bootpd/dumptab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c index d6839362f718..b8f564a99917 100644 --- a/libexec/bootpd/dumptab.c +++ b/libexec/bootpd/dumptab.c @@ -329,7 +329,7 @@ dump_generic(fp, generic) * * The addresses are printed in standard ASCII "dot" notation and separated * from one another by a single space. A single leading space is also - * printed before the first adddress. + * printed before the first address. * * Null lists produce no output (and no error). */ From nobody Thu Jan 25 06:53:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNd3TYGz57vFl; Thu, 25 Jan 2024 06:53: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 4TLBNd2YGhz4ql2; Thu, 25 Jan 2024 06:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eivGcwGQLpH0WBUB2KjxOZX6EJgRBbitZJf5jTniGwg=; b=UAgV/iD7J/Q4peALvR6DVCbvaTj+8pWtWKs3tIDl2+ISz5gwvf8xeU54ou5HpllHmJIz3Y HvOjZF2deuNMn+jCgR5NpMyRfi59Bndcgpe6mBgiH5PV/6SYw0TU5eSWWl09T5J+rTdSeD 1GTHyWdm6na/tsK6DUHE+oMv48V/8dvu34h8ZOclV0Hru+R3JsRv00f1oL2sx6dRV39Yti 9BHS3wq0sIEt4ks8rKdlUooGWj9lD8Rtb8FrzzsNn9SqnqfmzvYykXsvGYuYNL0J7ZplgA hlnhdzvvrAHBvqH/Q3wXokzWGPdBZnXDW775vrl0Y/6ldvlJWUfdmPlps37i6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eivGcwGQLpH0WBUB2KjxOZX6EJgRBbitZJf5jTniGwg=; b=o+HlrqTERCoYEfNXOaPjv3zxMxwW5i9Ueraf5xgt/rzBzlHUKVxkL2Zhw8OQSnUbS4rS7N j7UyCrptZCvJdOIItoYVwoJpo080qIUKCGWz3+N9KNfbVL5sZiFtYo4kMuS9frCLA7JxBL Q65ekVv8tkdJtFGPFaDmyodr4w9hQxJXUh54d6mqGcgtYj9Nj9ekSN9sDhAOHmcBVpPMqF 8uisRQfL2XkMtklt59uCc0y7KYJ+qs2G4afnBLkS2qBbNPUPwgqZDDJUz6OYwRNoJohRpp Hft9o3QKyjO892ZT7S34DLVLzUgNehrQppn4cz1+mU/86g3MBBJuCq3DC9sGQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165585; a=rsa-sha256; cv=none; b=HdlyDvj83h2Gm6Qydpf4uTqZAX6G23rfQ9u9wYtjjB1s3SPcNzVoThwtahJ1ULJ7FGYKQN 7FApB//Zr42E4adcsQdDvoNQ35LhzHKtO71w4gSERef9qdjIvanbHlB30snreCwPQhaLHV yqDUiVdBeox7kEfDGrXQAkoGlDbWtW0N+5vBKTHrQffEBGx9a1t+zoEJcFQCkWkqFT1qZD 7wmQSH9mw0lzC9JEehjW3bg/wdKfgJIn2i7OaL4uKNcts4nTwL/fhDgtvjBaWsy5cUFYQb MPMd7N9UEx4Njwgg0uUIv5Bg9UMVeMPeR7fWUEiOanAa9cCZdcCAAPDPbR/xQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNd1fxHznpr; Thu, 25 Jan 2024 06:53: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 40P6r5Rj034429; Thu, 25 Jan 2024 06:53:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r5vG034426; Thu, 25 Jan 2024 06:53:05 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:05 GMT Message-Id: <202401250653.40P6r5vG034426@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: b146a9c34084 - stable/13 - bce(4): Fix a typo in a kernel message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: b146a9c34084787ab16a12ab6d2b4c10df25a6d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b146a9c34084787ab16a12ab6d2b4c10df25a6d9 commit b146a9c34084787ab16a12ab6d2b4c10df25a6d9 Author: Gordon Bergling AuthorDate: 2024-01-20 19:10:21 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:51:19 +0000 bce(4): Fix a typo in a kernel message - s/adddress/address/ (cherry picked from commit e1c0d368d630cce01691e1967ada9f36d6b8c751) --- sys/dev/bce/if_bce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index cafb4940b440..322ab8328080 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -10663,7 +10663,7 @@ bce_dump_driver_state(struct bce_softc *sc) val_hi = BCE_ADDR_HI(sc->tx_bd_chain); val_lo = BCE_ADDR_LO(sc->tx_bd_chain); BCE_PRINTF("0x%08X:%08X - (sc->tx_bd_chain) tx_bd chain " - "virtual adddress\n", val_hi, val_lo); + "virtual address\n", val_hi, val_lo); val_hi = BCE_ADDR_HI(sc->rx_bd_chain); val_lo = BCE_ADDR_LO(sc->rx_bd_chain); From nobody Thu Jan 25 06:53:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNf5ScYz57vXF; Thu, 25 Jan 2024 06:53: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 4TLBNf3rJWz4qwB; Thu, 25 Jan 2024 06:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8W1YUXXLoRYC/+fQT22A9vB+5HGVjeTo8EjzUA+1AZ8=; b=GKtTdiAMD56Gm256j/Mof05q1pF5JsMvctuopKVxExt0Rwi8l5F9YCezVp8badCtWg64SW kWprMmDTTbIKTUfBRXTPPhiCQ4VN2hk8nap4dr8KdFS+VkWb9uotXjpmi6MP01N+NK4wOB Qo6yQNzmm5jIx/7FLMv7wC+5c2J6HwmSPKSxlX+2SkQiHABMuXv/ySku/0V6dAbeW1znN8 PFlDIoUIdORCzGsPhKGsPs57FGZdIfxbCybsCVS3AY2zsZ8la3W7Ak0QyQDH++fRyxBv+d XWV2Tzd8eoE3NHf0rPhtsr0fgoGOAz22s/0knrdcemRtZweIaTe2aw8olsFDcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8W1YUXXLoRYC/+fQT22A9vB+5HGVjeTo8EjzUA+1AZ8=; b=F1mbbjlj1bjFZY6dNF9egrjA8k6D/G+u/S2AFJsC0WOCIze/v2eS3ufctG+RI1b0TYM40E NZ0uiuCwc1RByfIm9/iZZNNsZ9tP/uVpqXHNNYbajAJbJl8Lz83K/vkn7IvfGyt/Nkodoc TTCxEhKW0m4ujK+deThRx2+kLE+QFY9vE7D5GGF+szUU7eGywEgHOa0lwX+zNl92PAoqaW vZIvkD/MRfkGjP8BloY2X5kJs/dBCfScjR/KhmYNAvUL9uFGrxer133ZCTk6MDwrnA3Fr1 +9BvpElvzkIejxnoUoxv1iucqJpT/FnP1A9Gw93YQ0ZH7TxQsO6EXqfDaVQwTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165586; a=rsa-sha256; cv=none; b=DrPyydwbahQbICgTG523q0gX9ETULKQzG1xbMhpabrkIy2CSxXcMFk6Dhv7r35CqHofXCg uhKPJKxAC850e1D0uolgQ481nhnEUc/bVKTkJvgtGSmdIilAOi+CkCNMxyR9rt9YICc3XO qGfhjGT82b09Vf2uPsJd5rxedWsYM64jKudwe80ZMZLEBiz3YdjLJb2ZPXF9O2PG4XhjHJ QRTcFCKlDfn3UWb2XcbiF9lWssGr7/U96u8cRT/0HdZUpFMKA2yepT/hLhfLMLPbR6o0TI +dbOWzpBlHlSbVd4C45zDwkPfGnu1m2GyzFr72jiJbr9/xzd/cgDV+FYLjpMgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNf2yCSzmw1; Thu, 25 Jan 2024 06:53: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 40P6r6J7034485; Thu, 25 Jan 2024 06:53:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r66n034482; Thu, 25 Jan 2024 06:53:06 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:06 GMT Message-Id: <202401250653.40P6r66n034482@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: 48aff6a116ee - stable/13 - aic7xxx: Fix a typo in a kernel message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 48aff6a116ee202e2474bb9ec9ac0d7f8f7834b1 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=48aff6a116ee202e2474bb9ec9ac0d7f8f7834b1 commit 48aff6a116ee202e2474bb9ec9ac0d7f8f7834b1 Author: Gordon Bergling AuthorDate: 2024-01-20 21:01:10 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:51:36 +0000 aic7xxx: Fix a typo in a kernel message - s/recevied/received/ (cherry picked from commit 54e047b13baaa5eb613e98991f807e7b6f893f78) --- sys/dev/aic7xxx/aic7xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index ba3fa46d01bf..68f189f5dd48 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -1109,7 +1109,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat) printf("\tCRC Value Mismatch\n"); if ((sstat2 & CRCENDERR) != 0) printf("\tNo terminal CRC packet " - "recevied\n"); + "received\n"); if ((sstat2 & CRCREQERR) != 0) printf("\tIllegal CRC packet " "request\n"); From nobody Thu Jan 25 06:53:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNg5xgFz57vck; Thu, 25 Jan 2024 06:53: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 4TLBNg4dFBz4r28; Thu, 25 Jan 2024 06:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxIJcEyoE89n+FbSiehL2ZaG3lWQZotD88R3FRGI/5U=; b=uswJDACjCO9DnoKjGpNhStiSF5vMry7pNui4K3MBF8C84ERwO3QruSiw9jJ/VdrBDHedix ZP9o7mwtjmwJ4e5B27bUQywuSQSEmZdAvnpadD6Tp81IJQgN5c+8oet6+NiZ/YZjO025Pl yGmdHHiQHWPJjBTBBPW441w/FbKIwzMg6Tq07MF66Xmq2NM8mOSEFqmPdWZ0z/4+xZU5Lw Hsha7ZZhibEZzT+POuskuBOTbtlRNAPuNPKEB6MSjhJLg5MJuiaBzypXdKJXMZspUUW7bj crL/4OBl+6z/GZI2/1wbX95SSujL+XFgj5j2Zsl/i7Jpd/63BgMeMdU62Yn6mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxIJcEyoE89n+FbSiehL2ZaG3lWQZotD88R3FRGI/5U=; b=YymkoOZObGhFBj8oabWHdd3+0wq8vgykOAVzd0gG/y3jRM9yXrWV1CbhoAKMRktpNO6mCX hWNFX16KUkDBePivbI470mEGIL8zEZVMgY1XE0vvz1xuwsmMFeqO9+JaedTA9z/E+LDLqm jU9WocCnKJzghIlL9i+yfUP2GhCEDD5ji7IWMJV2qB2T8HL2yZjMZUv52uSqacelZIuJBh S+dJph2y3hr2q3nR1lGgGYquYWRqgXiWsdnVnqRCtzZ9/LB9bwzsJjxATUxbmMSGASsL6w A7ZOUzFuWJWSFbue6LLxuu5W5VLUAfTSDlSeBJtdr+IIPL3lkfmoxi5OQ5Fx1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165587; a=rsa-sha256; cv=none; b=XuC1MzSK5FMrnjp0niAmg+FbNoPtwcnl2Xkgef4k/NBZFAQ3/AB99p5WpFRqemyiSGRXI+ srriDhHhXFiqg/uXQXjH3I+xGLTrOynesMCMgYSufGC7swX14k+MFrZwsSCiwakk7F1Pd9 ZIJ9kPYmgiGyDzfZIeKUnGnW+prtIfL3qn+vxW5lU7YO+n4X6++vTL3cI5mvUdW/eYJlqs wJUX/7LSPab9fkFY5n2pwBLZtduJNC9ev3pvxrSYx/cUERZ7xx+50Jsple8uhfiFsXeMb2 62rAp6xH9g5SWSG5fb4FW0loXlC8Zlgk1kr4FdBhQnf6RubODKMfU9mdroXmyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNg3lJYzmw2; Thu, 25 Jan 2024 06:53:07 +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 40P6r7s8034547; Thu, 25 Jan 2024 06:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r7aS034544; Thu, 25 Jan 2024 06:53:07 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:07 GMT Message-Id: <202401250653.40P6r7aS034544@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: 416cd6de3b83 - stable/13 - netpfil: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 416cd6de3b83710421997fb29f22d77797448a8a Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=416cd6de3b83710421997fb29f22d77797448a8a commit 416cd6de3b83710421997fb29f22d77797448a8a Author: Gordon Bergling AuthorDate: 2024-01-22 20:50:57 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:51:47 +0000 netpfil: Fix a typo in a source code comment - s/strucutre/structure/ (cherry picked from commit cde9ec6a451d22ad65fbe602dc57135177c0a865) --- sys/netpfil/ipfilter/netinet/ip_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_pool.c b/sys/netpfil/ipfilter/netinet/ip_pool.c index 99394232fc2f..22f687d3a4fe 100644 --- a/sys/netpfil/ipfilter/netinet/ip_pool.c +++ b/sys/netpfil/ipfilter/netinet/ip_pool.c @@ -1098,7 +1098,7 @@ ipf_pool_flush(ipf_main_softc_t *softc, void *arg, iplookupflush_t *fp) /* ipo(I) - pointer to pool structure */ /* Locks: WRITE(ipf_poolrw) or WRITE(ipf_global) */ /* */ -/* Deletes the pool strucutre passed in from the list of pools and deletes */ +/* Deletes the pool structure passed in from the list of pools and deletes */ /* all of the address information stored in it, including any tree data */ /* structures also allocated. */ /* */ From nobody Thu Jan 25 06:53:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNj2HZpz57vcp; Thu, 25 Jan 2024 06:53: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 4TLBNh5xQjz4r91; Thu, 25 Jan 2024 06:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkzxjVF+3rKmA86Hm0Rpc1kyYsSuoHyO1SA6bTatDiE=; b=qRqVc7hdbEZUyAR+MMyjy3UNA+OetQwLLPHytSzOrIez9KfFQf8kuEgJoiMN91Z7S1aB2e UvENFe/0wuhfJatH6Ni2jXuIFE+mUUTw6ezZq3oO0njf4GJIRaBmZd2aUOImwaDgk6qSi+ EQcbt/oCUViJFJOXyECdo7CSN7n0APK3B6/G0MnXw6HBiHQFTEj72Dak1D1iRGMAeLUkHK ja03gsz+YMjl9w83YAHqGAX9BMNQnuHaR+Qxq6ueZO6pWwXNJDutsqZbe43sNEtBElOKOZ kM+Yb9gRhgd9DCRt+bN1xTstXE1XXHspneuR0x8a2YnG9k2NgqAJfFAV4FkTkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkzxjVF+3rKmA86Hm0Rpc1kyYsSuoHyO1SA6bTatDiE=; b=kdCxJwbIRWrSpTGLQurTSA4nFp3nah3bUM9lIxyXYoR3pQcW2kbXDIZ/riJ1bottn2Ajwb S61+dvImEkj9uRpjf1DNdcPbW+A72ZJALQSkW1zz773o+FCS/4+MuSV6uzR2H/6FMlyX2y gQdF2XaaZGmvCraGr1wn3ts45d9tNL9REOeUt2GeeomD3C493NqnTa/XPMKcSPks7M+qW+ /Hf6eiGaH3JMGdw5HamXsF9dll6ZLhHeCD9U6VdbQNly46rb2ZPjxcFhVnlG6pYTCd58Py iyEdY6AejZOwrbRr1VXOqQ5gouE6ftgVpo7Va84eIXIA+1EWt6NZY5yBAL0hiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165588; a=rsa-sha256; cv=none; b=NliUN8hCU4w10Q54LidkL6yBsBgtIK7Wu2iTKvCmtDkG8oWmKVjZDK0Ax+xfs+/R6xIkOc F51quFAlP8WJvzLLN30nm97Hl9nAUzctlckJBZR3RchqHqzLnOAhNaggeMpMXPifqIxbb8 nyCJK2h863qXCLg1vBqEukpKJBz/+iEcmrsZ5jWI0DbbVC2ISSB6+86q20Dq5vhOgTk2Fj pvVXcXrfhT52keUKoGYedmVzqVuVUhmit8oNcQnTuDFrjDZTRr9h/2Jb9jFCj2lsk6d5t6 IUgEdL6INqasnR2VbCf0QE3jY4nw/BxjPBjUlawhWROqZXQ82gnHonxm17mZWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNh52f6zmw3; Thu, 25 Jan 2024 06:53: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 40P6r8hA034598; Thu, 25 Jan 2024 06:53:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r8jx034595; Thu, 25 Jan 2024 06:53:08 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:08 GMT Message-Id: <202401250653.40P6r8jx034595@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: 664eac6c9151 - stable/13 - fusefs(5): Fix a typo in a SDT probe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 664eac6c91515e2472c3d7a7cba6588b17fb8ba0 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=664eac6c91515e2472c3d7a7cba6588b17fb8ba0 commit 664eac6c91515e2472c3d7a7cba6588b17fb8ba0 Author: Gordon Bergling AuthorDate: 2024-01-20 16:24:22 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:51:59 +0000 fusefs(5): Fix a typo in a SDT probe - s/userpace/userspace/ (cherry picked from commit 6f0da017c973f40c1bc70552c922c500a0a8c858) --- sys/fs/fuse/fuse_internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index ea5330feaa37..13d18127d2e6 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -998,7 +998,7 @@ fuse_internal_init_callback(struct fuse_ticket *tick, struct uio *uio) * But there would be little payoff. */ SDT_PROBE2(fusefs, , internal, trace, 1, - "userpace version too low"); + "userspace version too low"); err = EPROTONOSUPPORT; goto out; } From nobody Thu Jan 25 06:53:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNk1vR6z57vZW; Thu, 25 Jan 2024 06:53: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 4TLBNj6FD6z4r4l; Thu, 25 Jan 2024 06:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=peMhiTpzID8C3sbqUEfmsCikK9kkq2c+gMpRleBeF60=; b=Glf3YKEc6r6/GEjZTaRcUFoFh+Qb83BLd3S/rpXkvrzMYfBZ4yCqeIX5n6O3uN5Q0oeOnH cVu8bbyA/VFgWALf5IW3000gCBDcF0RUgMsLgHjcSPHimk4xoW08BMPsdcOYnmi7HWJrEV OgFb+O1UmjjXeEIVryN6soBU1ciY956C3zv0V8jLdey6JXpmqVb3TlNHjbuf7kQGdMG6lG I66wL9Gqmum8U58K4iYol396ozJoK5cl6OTUfGn7DmOSL/+cQfcvgLkv3wN1DvjDr1yHIj PEvqZmJdLTiL2WKXNGA2CpJJDqTGOFWsHjBJ4DNlQVHVIVywmJgipIyOAppyQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=peMhiTpzID8C3sbqUEfmsCikK9kkq2c+gMpRleBeF60=; b=seSusGg0cCtNH/wrTWjiPHKz3EzlPqvIlwQk4fyGF2BnxHGk7wAT6IiEDk5+xPu9d/Sx2g mVxvAbqGeevfZKcCU04V5allhLwIdPeyrvrHdWno+WqgzrVyCw/76vJfID2F7mNuzgAxe1 9HxgwUfUPJAzvlnWcuQfre0JmcBYdo7zcNV/GNce9V2Y7KLK6PahESWD8rGk37Naio1kce /RoX58cHc6NIx3TGwUSBhTriUA8rihKSY3a43/i0bZZ3j2rbMr+YRT9yz447Rh0D8PsyJv A5YtClaitAxhBoRmKHW70M/oxNqkr6BEFKhb46IVYAiiDaXuwPEhaqueThF+tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165589; a=rsa-sha256; cv=none; b=sQ2oEvYzimZRl66FLYwqcBh35A81d/v+InXcToW6vZ090E16UUriUK4pjcJ3tLmYau226A 3nmAIyVifATTXTVP8v0a3N1v6I8n+1oO7vit+mJQmIZbpwIiH/rgQnNLXz0Lbhaw6ivQ4k kZ/s4/SLVyp4WHZe2diOzkD5rW8y3ilKPAeeS5KdqE826u758BiYdX4XBsltByL+MgPW2h uHAPtuowv/7UEqjfRmGOH2fQr2EhsjaD5rkWrmEOu3rRmtksZedKbbxkQWp6p4quk9XX4x i8Hvdzp84NAAmBnyoVynySaOVG2Vujhh+MZtCz0l8mz9dLQx/QK375sG+0yYUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNj5MMKznps; Thu, 25 Jan 2024 06:53: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 40P6r9Hp034657; Thu, 25 Jan 2024 06:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6r9rL034654; Thu, 25 Jan 2024 06:53:09 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:09 GMT Message-Id: <202401250653.40P6r9rL034654@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: e347b72a3914 - stable/13 - netinet6: Fix two typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e347b72a3914be25ff77f987511165fc1af4562c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e347b72a3914be25ff77f987511165fc1af4562c commit e347b72a3914be25ff77f987511165fc1af4562c Author: Gordon Bergling AuthorDate: 2024-01-22 20:48:34 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:52:11 +0000 netinet6: Fix two typos in source code comments - s/adddress/address/ (cherry picked from commit 496432f192165b8700da4b0ab8ebdd253002e265) --- sys/netinet6/nd6_nbr.c | 2 +- sys/netinet6/scope6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 7f6ce3f80e22..70f02561cefa 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -284,7 +284,7 @@ nd6_ns_input(struct mbuf *m, int off, int icmp6len) } if (ifa == NULL) { /* - * We've got an NS packet, and we don't have that adddress + * We've got an NS packet, and we don't have that address * assigned for us. We MUST silently ignore it. * See RFC2461 7.2.3. */ diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index b3bb5c248834..f2a68019fa13 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -512,7 +512,7 @@ in6_getscopezone(const struct ifnet *ifp, int scope) } /* - * Extracts scope from adddress @dst, stores cleared address + * Extracts scope from address @dst, stores cleared address * inside @dst and zone inside @scopeid */ void From nobody Thu Jan 25 06:53:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNl1NP0z57vZZ; Thu, 25 Jan 2024 06:53: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 4TLBNl0021z4r54; Thu, 25 Jan 2024 06:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWTunj4RZa/boFVEU6ztG6JNAl/pnWrBdEcaxErOPi4=; b=eRC0+GrzDdQ02f1ehMRaMwtg5d/9pB9KdENkPdqov7iJ4KRvp1pov0rYjgtVj7PDYUxw0b 0JdSCEHwDgFd6vJnm6joZ3VEBhC+vzhwcnbaNoW+ADwE0gXxuSHL1XfEmdlHGXXV8HYNiq cw7trOUSeXIyZ52Or5IbhfEqWqLQuOj04MMtl27RnUqCGjW6sJwObN2smEnnN/ykKAewrC KMyo6dtE5s5r8Y8GVZ/rZZFLzux74kftaJoX0q1oimDubIHDcrB5ZR2v2bHxYDK1ArsjH6 NoLbfJlVQaS7AAAvNGUcPfEDazz+gVS2QLV54o9jgJVp31IFegK6v/ygYTubdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWTunj4RZa/boFVEU6ztG6JNAl/pnWrBdEcaxErOPi4=; b=mek+XtEfgcRMbLj2+XB2NG6OiAY1ly0peUIUPesds/oYq0EvY2zQF4LW+oBR4Kgx/RpNjk FlgMn4T59UKUigYQgKLV1CrKGg8XZ2FJmeuGr9FFm+0Tqno3Ayz6Ol3mLORmiZdVXS8aFY oFoxI/FyvYH+C3z8AOgpfC3BFQIQlpDLauTc63Nrp4kD6OPdIxC9VemPMliFJPUaLhDd+n 2ZWBP946DlGPTqPCktN+ft/WxFDu9fwrc6hziWIAB4oo9636O2orSd2B8H3m1i+uOQ95a/ x7P8Y59866qvdJDCGdTKIss/+irrMPQdNUyysZ9+QX5/GSl8so2TGCFtA78Iag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165591; a=rsa-sha256; cv=none; b=fnrsyWNPssbSlv46H3ATlNNpB5D3o/5iDd65Gk6FSDboCS/pRKQAM3QuyYF68gdt2WuFWh vlDeTMUXDeSS+OECDqWQQSUEJZgqhd9zrUhgFaGtcdRoVMn/YiaImQeAtJMb7isEqWwYsb NG6nsbLCpn0+q+zTVKQiNcnr3fuXj63LbaKPvXvF2i2CIblWopU1DJdSkNmrhHn9UtZarr vmWYJaBGnroz34M4h8K0ZoXIYDOZKjiA3Qz4lI4Z9IcB/Jjr4QH6M344bERtW86Q369kNz qkh4Vmbmc9IdHcJtfjTYDI/mvJ43WHEjT3kUvUEvF2q0L0EwroqS2ziVFcqejQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNk6CZczmw4; Thu, 25 Jan 2024 06:53: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 40P6rAKF034720; Thu, 25 Jan 2024 06:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6rA9f034717; Thu, 25 Jan 2024 06:53:10 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:10 GMT Message-Id: <202401250653.40P6rA9f034717@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: 774644887a8d - stable/13 - meta2deps.py: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 774644887a8d97c83bd9195f9d900dc90b0a7fcd Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=774644887a8d97c83bd9195f9d900dc90b0a7fcd commit 774644887a8d97c83bd9195f9d900dc90b0a7fcd Author: Gordon Bergling AuthorDate: 2024-01-22 21:00:36 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:52:26 +0000 meta2deps.py: Fix a typo in a source code comment - s/follwing/following/ (cherry picked from commit ad92f3d9d0b56ee723271152cec9174f74e17cb9) --- share/mk/meta2deps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/meta2deps.py b/share/mk/meta2deps.py index 4627e08d7c11..bd71a1888e9b 100755 --- a/share/mk/meta2deps.py +++ b/share/mk/meta2deps.py @@ -184,7 +184,7 @@ class MetaFile: def __init__(self, name, conf={}): """if name is set we will parse it now. - conf can have the follwing keys: + conf can have the following keys: SRCTOPS list of tops of the src tree(s). From nobody Thu Jan 25 06:53:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNm4HHzz57vL9; Thu, 25 Jan 2024 06:53: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 4TLBNm1CJjz4r9s; Thu, 25 Jan 2024 06:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jWq4TnZ2tH/xV2bsCFSOP9pAf+Hnh3/7ORFsDIq9Jq4=; b=iTF1asPe6ehKa7e2SnJwdeQS2UTrWdEm6dSuUyjBAdhInWDWwSjnzxJaUKvR/996obkR24 RhSWqNXDNWFVoUccdU0XeWQiHC30MEZpxqIk3IfGOsT8hoE2F1nalutvU+bc+K7C61yw9G ynZjBUm5RoVMfY7fhu1MkQVzNrelu3pXy1aLVe8GbZgC5FwMcye7KJvE7444vpjefVTQ4N a5RkPBkGva6Wxo5FuypTjTALic7TFbnZa+4cSuMAwY3plt02LAnKaaB/u4pwK3rMjIWgSr Pho5iipeBmD+jumHDTMUH9CyIUE5C+PDrEBM+tFBkmfHWHcvUUFlvFQtR+FWeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jWq4TnZ2tH/xV2bsCFSOP9pAf+Hnh3/7ORFsDIq9Jq4=; b=xdWg5mwd69VbqAEw/fCVS572RVQLUeZ4jfdx1HvNqbOsbIRQ+Eu9TKAtretyzXTg20e06d ZkJ2STvmKXPBiWGnFtPKEa4nR7OZJDMbPjpwlAbhaNhk6+1ds+wuhFTKvt5uLdIaqPArvU eGREdhCpMVpzUnGjSmFqNH3WRoBzFiI7lkjQLAb9lvMMfvsD2NOJUb1h/NH6ihJhLb+vGU pGdMYM+ed+p/gDsv5ca7w1Qc3D81x0+VR2MdDCNWkLjd7+VxYMJXznoT6FRXmdkZO6Ss8M /n16Y4IyRKBjYdebwfvey5hft8jH0f00NJmIZknc5aCKR1UAb002ydlDgFY7Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165592; a=rsa-sha256; cv=none; b=icQV3YrdMeot8IQiAcLeVLMSlwZHnaWxboPHIVG8E/xHIe8bkH/wveWKcLvmzRXG0ADQYF WIWoyT+hNP43QAL7G/dFIwYUjfYl0SjhEybeIyn183yzprT31iu0wjQbKWleWklMbGkvxi gbSlCQjipknjg8EUbOQa/a5TZ45kRyl6t+DlmrQY11EWl8Rh+h+u29i0Xc8Q8q4AwlTyRz GXLEOUgo2DaLiIe+9x0S8aHfoXuzk4Af4SbT+z7GkopUM5pQVVA/JF+hA4XkiRoHUPyWdC 96+YOka9r/fq7DryskrSfoDjG598lSNRTUpz+0SytDGYhpP6AMGo/eP2spICdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNm0KLlzp16; Thu, 25 Jan 2024 06:53: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 40P6rBBE034774; Thu, 25 Jan 2024 06:53:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6rBew034771; Thu, 25 Jan 2024 06:53:11 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:11 GMT Message-Id: <202401250653.40P6rBew034771@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: 94e75f5e29b6 - stable/13 - if_llatbl: Fix a typo in a KASSERT message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 94e75f5e29b645e351cec7ec287aef5b48762fd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=94e75f5e29b645e351cec7ec287aef5b48762fd9 commit 94e75f5e29b645e351cec7ec287aef5b48762fd9 Author: Gordon Bergling AuthorDate: 2024-01-20 20:00:22 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:52:38 +0000 if_llatbl: Fix a typo in a KASSERT message - s/entires/entries/ (cherry picked from commit b4c94968d1bd1ffdd43976b0315e2b6c2b620ee2) --- sys/net/if_llatbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index ffd5cb7a9899..0c5690db74ef 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -705,7 +705,7 @@ lltable_free(struct lltable *llt) llentry_free(lle); } - KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entires not 0: %d", + KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entries not 0: %d", __func__, llt, llt->llt_ifp->if_xname, llt->llt_entries)); llt->llt_free_tbl(llt); From nobody Thu Jan 25 06:53:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBNn5j3cz57vcr; Thu, 25 Jan 2024 06:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLBNn27Whz4rB8; Thu, 25 Jan 2024 06:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3puXJmflO3wCkPquA4dYfI+lXORhi5wuot6NEV00IgI=; b=MWlOKpjO1YVafJFPm/70F4ubW3y7t2y9/wFpBmiyb1DAPhGYHfcoL9aoCfrifqDGVhfd3j toHqYoWdbFv3+CiVO9l1vPb53XdxwVrUdXMTFkD9Ul8VHP/BZssxHGJzwkBRLDe1tZji7G Aq4nP5igu52W7x9vovY6d5FrXEkoa7tHStAxCUBrBj49DLsFNb+okPBQUeo8AmPApXkTAW MTev2jp6Wa2kjEU9c9HA81/SgeeqtPrBuEyzoAGr0CwsvxI0HGZysliZxvK2t9W5RFlVc9 6wSTz60Zo9ZT4CpCjmleCFilZECZySfUoq2i9taNv33Zd/kE7yu7kYu2qyEipw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706165593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3puXJmflO3wCkPquA4dYfI+lXORhi5wuot6NEV00IgI=; b=l/AGcJ8AO5oALhfm9SY7wmxB0ztXRAgRlWRM0T5agQeu55HdfsX/URInCvpIc1XhdOkXdO pfbwTnvbPw4dhLmD8LRB3jVguuhLBKdTgjhMloZqKv0Po0TCDRCXh0n7fHJbgkxKxEmRne j0mdpkjzgo23a3jQGcP9mycK6zVgb5uUhghMm1c0J3iLyg9ETmXV4dQugH8chrXQN071aK VnvlvX/E3esa4RcrevTedxTQcN6zi2ODtp4UpwgQCRHp8gp/rYyoZ7sBiL6VkM/w8B3QO7 Ohv5jl+bp/rPxB8bOlMgHVoRa0yWixlv3sosjGbLu2Sjp9eN4jdIOdvyS6NdFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706165593; a=rsa-sha256; cv=none; b=jYyTedfdQqne4fCRxjjJfwVi1Tu/i7aMAY7aLmiU5RHxNUhY5d4r9dCmoEwIwfZo7a5eqA l3c18m6MKCJV0wqLZlhBLz20aKjIwla3czirdJS853rkYm13C2p51QRwCMYxk6WzuVQvG6 PcHc7TyGiQtHJEkPtbfjxYAQEJcmynMDeQKkqFRDdbqTXmCTRPyWubKqIRMG3S1JaxTo4P wX5N7fS3rCqInpa1r48yShLIl1TMegfCnD9JZYeeRLu4K5AUbwM/rGpCzNJm8SJ4yg+sAM Z6yMjxdjF6MhZPIXJm3yG090ezOwbp65VmeNOZpNcJWHPB3dr+BGTZuxnke5aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBNn1FLtznQ1; Thu, 25 Jan 2024 06:53: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 40P6rDs5034945; Thu, 25 Jan 2024 06:53:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P6rDBM034942; Thu, 25 Jan 2024 06:53:13 GMT (envelope-from git) Date: Thu, 25 Jan 2024 06:53:13 GMT Message-Id: <202401250653.40P6rDBM034942@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: 6a7eaf04f166 - stable/13 - net80211: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 6a7eaf04f166b141b27da70d18a737bac48fbcd4 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6a7eaf04f166b141b27da70d18a737bac48fbcd4 commit 6a7eaf04f166b141b27da70d18a737bac48fbcd4 Author: Gordon Bergling AuthorDate: 2024-01-22 20:54:36 +0000 Commit: Gordon Bergling CommitDate: 2024-01-25 06:52:46 +0000 net80211: Fix a typo in a source code comment - s/recevied/received/ (cherry picked from commit c1ada39783109c496fde853cc2fe32f31a8f7516) --- sys/net80211/ieee80211_hwmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_hwmp.c b/sys/net80211/ieee80211_hwmp.c index e743b7dfb6f4..1dea4ec30106 100644 --- a/sys/net80211/ieee80211_hwmp.c +++ b/sys/net80211/ieee80211_hwmp.c @@ -1398,7 +1398,7 @@ hwmp_recv_prep(struct ieee80211vap *vap, struct ieee80211_node *ni, /* * Check if we received a PREP w/ AE and store target external address. - * We may store target external address if recevied PREP w/ AE + * We may store target external address if received PREP w/ AE * and we are not final destination */ if (prep->prep_flags & IEEE80211_MESHPREP_FLAGS_AE) { From nobody Thu Jan 25 07:20:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLBzz2pDHz57xqv; Thu, 25 Jan 2024 07:20: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 4TLBzz14mwz40D3; Thu, 25 Jan 2024 07:20:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706167215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5rIcaMVCA2K+TzXA88M/V0KuU9256GI6g/Q58fQJbBk=; b=uSquPOxyqeqVkKDoIkZDThT3ACj1yV7NTCAS6fIQA15UG8ogEUbUlno0WMdCBHH2eHXjaW 1tC7mduMstM+9mSSzkLmpSTBbtGEzwm0yHUfIHnYu8xExZVfgND38Wnfe470/9uAqn3Xe8 VbPR7/ASxz0DQ4TDCAlU7jCyzK6ohlPgGFFOFVsnzzFHcjp97+rPLMaR0O8y9Hqwpz9Xn7 wnSC414e5sQcgrS4yDllL5ORzl49RP4+Nx1GuFBPHBgqM4JrdGarNf3FIb+mRr+/6Ykx1U PKiEmgSgJ+h+TEVdlaGUdXsIuZrNkYYiacBKI9OkknwO5Om+8qAAPQLaN4bv3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706167215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5rIcaMVCA2K+TzXA88M/V0KuU9256GI6g/Q58fQJbBk=; b=DxAmTzMSQ8MHBPGFjzaOE5N4f/NzhFJSny8D054/tKvcNjf9u/ImxKYzP4OY+czjCxdqtb 67R6Sjckixs4pSJz5keZeMM/Ci/CH8NmIzUOomPuXQ0WiyxAS+iUr8MCRPUUjg7+5qzkoE 6PRTiBvNpOoO8RiLvkoMhpVo66AGKMmpgHeFyy0HTL5c2vonTckI/2Exlr2fDtySzqiChR wBA06/rWBYyq1TRK1r80sU1/IqJUktd1TtC8XpihlHPoBP9rJlyp7Dobv9/L9iYAsOaBxQ F9goN8bRor9HQtE6gftjjF29vfi7gYccBIopMorc+m7zDGa28wGe8veaUiRkng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706167215; a=rsa-sha256; cv=none; b=Er9e4yvvoIHC19BzibVUhhRV7MN+jpud4aVngyulKr1APYakRZQCzhq4ujxXR9VN/Em4hz iccKEqJ1l6wglB1zgF34DSK6nFHPrqUnnBOoDOWrOToM/mA38k9E4i2Du2vLyHE559+sPQ eyiC8O4Yf/r/asCTNjtC8+fBZZHrz9zIOVVlkaBwh6aA6/vOFyrr4mrGCHEFNSWj+vuPxJ 24GkjpnLi8KHOPGmTjg3lOJrlDC0mJOUJ3EK/LcvbnFfem2lvSMup70IEBZuca9SC6NMHC qsxbZ4AEJd0mwruoqJ6jsJkLEUEEvGUVGAL6wdXWsmOklOfZ85iFucQ5S7YHxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLBzz0B0Fzp7Z; Thu, 25 Jan 2024 07:20:15 +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 40P7KEYN076898; Thu, 25 Jan 2024 07:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P7KEhu076891; Thu, 25 Jan 2024 07:20:14 GMT (envelope-from git) Date: Thu, 25 Jan 2024 07:20:14 GMT Message-Id: <202401250720.40P7KEhu076891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: b8a484ec343d - main - man: support special characters in filenames List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8a484ec343d163a40f7cf4a6026e880f992c738 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=b8a484ec343d163a40f7cf4a6026e880f992c738 commit b8a484ec343d163a40f7cf4a6026e880f992c738 Author: Wolfram Schneider AuthorDate: 2024-01-25 07:14:06 +0000 Commit: Wolfram Schneider CommitDate: 2024-01-25 07:14:06 +0000 man: support special characters in filenames man.sh needs to handle double quotes and sub shell character as '`' '$' etc. PR: 275967 Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43453 --- usr.bin/man/man.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index efb05603f912..4be38083462c 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -349,7 +349,7 @@ man_display_page() { decho "Command: $cattool \"$catpage\" | $MANPAGER" ret=0 else - eval "$cattool \"$catpage\" | $MANPAGER" + $cattool "$catpage" | $MANPAGER ret=$? fi fi @@ -374,7 +374,7 @@ man_display_page() { pipeline="mandoc $mandoc_args | $MANPAGER" fi - if ! eval "$cattool \"$manpage\" | $testline" ;then + if ! $cattool "$manpage" | eval "$testline"; then if which -s groff; then man_display_page_groff else @@ -387,10 +387,10 @@ man_display_page() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool \"$manpage\" | $pipeline" + decho "Command: $cattool \"$manpage\" | eval \"$pipeline\"" ret=0 else - eval "$cattool \"$manpage\" | $pipeline" + $cattool "$manpage" | eval "$pipeline" ret=$? fi } @@ -480,10 +480,10 @@ man_display_page_groff() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool \"$manpage\" | $pipeline" + decho "Command: $cattool \"$manpage\" | eval \"$pipeline\"" ret=0 else - eval "$cattool \"$manpage\" | $pipeline" + $cattool "$manpage" | eval "$pipeline" ret=$? fi } From nobody Thu Jan 25 15:02:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLPFN73fpz57QV9; Thu, 25 Jan 2024 15:02: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 4TLPFN5VkMz4pWG; Thu, 25 Jan 2024 15:02:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vcueVoo2+b6uQWchw6zWRhca2o9hE19y0Amdy7st0k=; b=rhcLlgcOBIZmZe+v72vSJiJYjXusj3SnUvNk5RISwDXtOCyMGN38VMP/kfYeHUzmgFP3zg lzoyxby/P3+qox70w3HlneckkxLZ+abAGivj1k6mCPjUVCwXu6p0ZYKApgs7pXtv21ZBrC 06bGBY6H+ltb53xCVIqShKHqAG/FyC/57mZOgaXEh6Q8wJd7g+vF44hntMEIRnmwNMhpzB Rd/s/QvRq8jju173vrdY7wfR/EkzQ0A+TfsdVwdCJ6ib8SOaNfuaaZeblIsCwneB2KZWnL lfg19XRZ6BcRlhZNGoRbIWQxAJzyrjy3/Ze9dyVjg1F9IeSh3ScGNEoesABNUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vcueVoo2+b6uQWchw6zWRhca2o9hE19y0Amdy7st0k=; b=S87tUevQHt4/8XuadRiH9Q9wabeCNn32jZMwARNTCHJioOOGV4MT2NMuHJT7ZVQ/WN/4fP BD/hY2wZYD8G/Rdj0h9gOkM0zWCCaCd+METelZCZ2hEpK/qS1uqZSwkOd1iJo9sQtESUTF pQO06Y1IXhv7ttkzj+PBczZK3fp4zb9AB7qtSW80fPX+h3pSZo7g/t/pZz1kGtwOpVWdSO G6fEpxus/X7WzKPB8xBU/b0ikH1+a39phoEzr4KlaKoYMxXeo2U+U2XNMertz0ilVDhw5T z8bXjR/Epl0mKoCmzE2l9TEaHDSMSXhWliQ/JQwtvxAaOGegdvyP6LVbqlxeIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706194952; a=rsa-sha256; cv=none; b=d13AuNw6UjXe/9i2dZCHLaqvIBJvj2rZnInA6HWiAyZuyT/nfInEqhOgd+Qupk0Hi6WbgR 4nU+bry6y9sDCz/0TConam7e7HIblA8sAyRvZXuCEEZK6X3CuZgpZYRWM/WBjmxipPKAYY fqG0C6VW7RS/YhkOzN4aMMEstJQ86yLrZj2UsONq/IKHgscxKoi2Y/KgxAueyEXK8n1rOt dYCEAEBoGOq75XTEYYwMuEpPcGMxAGE1t/NQSJruTnyNAciZ0hPAy/4ii6aZjDICdaT3tC kWGUJabgaKldjv7zuvlJy+9FG3LoiHkFubkf/A0bQjNYczkm3icbYku3rYEqBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLPFN4bTFz12MR; Thu, 25 Jan 2024 15:02: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 40PF2Wg7057066; Thu, 25 Jan 2024 15:02:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PF2WiU057063; Thu, 25 Jan 2024 15:02:32 GMT (envelope-from git) Date: Thu, 25 Jan 2024 15:02:32 GMT Message-Id: <202401251502.40PF2WiU057063@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: f1186fab56e8 - stable/14 - bhyve: return ENOMEM instead of EFAULT and call free() after being used List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f1186fab56e86b963a127bcdacbd1e8e1f03acf2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f1186fab56e86b963a127bcdacbd1e8e1f03acf2 commit f1186fab56e86b963a127bcdacbd1e8e1f03acf2 Author: rilysh AuthorDate: 2024-01-08 06:06:55 +0000 Commit: Mark Johnston CommitDate: 2024-01-25 14:57:05 +0000 bhyve: return ENOMEM instead of EFAULT and call free() after being used 1. In basl_load() function, when allocation fails, it returns an EFAULT instead of ENOMEM. An EFAULT can mislead in some scenarios, whereas an ENOMEM for an allocation function makes much more sense. 2. Call free() on addr, as it's not being used anymore after the basl_table_append_bytes() function. Signed-off-by: rilysh MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1016 (cherry picked from commit e2e956828caf2f1db308d54b264c277c0abc25df) --- usr.sbin/bhyve/acpi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 050e1a0ab75f..db253aeb523d 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -327,7 +327,7 @@ basl_load(struct vmctx *ctx, int fd) addr = calloc(1, sb.st_size); if (addr == NULL) - return (EFAULT); + return (ENOMEM); if (read(fd, addr, sb.st_size) < 0) return (errno); @@ -339,6 +339,7 @@ basl_load(struct vmctx *ctx, int fd) BASL_EXEC(basl_table_create(&table, ctx, name, BASL_TABLE_ALIGNMENT)); BASL_EXEC(basl_table_append_bytes(table, addr, sb.st_size)); + free(addr); return (0); } From nobody Thu Jan 25 15:02:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLPFP6xWmz57QXD; Thu, 25 Jan 2024 15:02: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 4TLPFP6R4pz4phB; Thu, 25 Jan 2024 15:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pin40ANgThdeyF5+ZkgJwIHRnC/TE9MN79049Ue+S+8=; b=S/oBOGypQpOhvU+BioU8ZPgI/CN1lvhMzZJFJLCJBCwHqJqndKpxLOzxiE1K5eb4/Jt/I+ hYc7q8H4p/6Nde1iRHWJZ/oJ2bk1re49JaPVeral1LMRy/P/qFed1KG+mFgX8U15fxryOe VoL/sEyMtaF+NFwj+T3htpN4iBd0wUHbzT4ewt9o1QTASMhtmGGty8sTv5G8GzH1IgJhRI r1x18Cxu6bN3oT9WV5tnHfToHvwZJJMngVYpAWHfgHprIpB9vvYa8/Ug0zhwxhJzbgyuG7 uH+ViOUa51NCdMAUkJRDcUirWBi3q9NkhEvd6dY/gxjavkuTyV1f6lnTnZANiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pin40ANgThdeyF5+ZkgJwIHRnC/TE9MN79049Ue+S+8=; b=YsEbnRJvnniwEtbXPOMFFjKgX86GF6ztwl70kFZ/YQsweMrrEDMBNlaLDZ+Bf4bSMVetdU Ll7VxpJFDr448vYnRaU1ldjRtauJ56vNz6SVo+yZVHw5JIKKDheaAQT5c0b6WdHK1saJqb bYx2MOr+umTypda9hcbgm+/pKDG7Up/hgLMaiXXlu7am3r74MVOqoG4+0h0hI+hh+vt8LE 1aC90GuwECjWwcOa/+RUZIrPKmqh2jdNMldPBVT6sAOPf6tD/afHa9rUrSpp+K5K5Djckj KIMsraY4AXfInHkPbR91B0gytJIW0hzbJaaj9oqkeU41g/8o1FYhfTiO2cHdIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706194953; a=rsa-sha256; cv=none; b=VTXY4Mx5fleTkataMHLakmkbJg25EQ4gZCZEzBKF/mnaDl/lTFVnS9lmSWrCRpi0YGJnDj WDSYkcqvYskK317mAz8khzz5viLK2oGFD6BEwaGhMdUK2D8WtvYBsnQ4IN45qWEnWEVgtH 3O0YGKNR7Obh9JvND07LmS8WOR1si4WOmaJxefENfcUB1d8bfArKivdqNRbmUck6xzaJl3 Eu03QDNlMjD+GXHplzlL31aq95yfxRzSxIyqX8oKQlofJNGMETqVqtH5hvzy/OB6jTDlTk tV4pSAPbv6nTDrt2+InmJbWhDpEHoMruJUJN1vzdflA8ZdJr+M3a4O4IE8O46Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLPFP5RZzz12n9; Thu, 25 Jan 2024 15:02: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 40PF2XNi057129; Thu, 25 Jan 2024 15:02:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PF2X9u057126; Thu, 25 Jan 2024 15:02:33 GMT (envelope-from git) Date: Thu, 25 Jan 2024 15:02:33 GMT Message-Id: <202401251502.40PF2X9u057126@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: 1c090bf880bf - stable/14 - top: Avoid printing a blank line when the ZFS ARC is empty List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 1c090bf880bf8879f75e4cd4b93c9a277faef2fa Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1c090bf880bf8879f75e4cd4b93c9a277faef2fa commit 1c090bf880bf8879f75e4cd4b93c9a277faef2fa Author: Mark Johnston AuthorDate: 2024-01-11 14:58:31 +0000 Commit: Mark Johnston CommitDate: 2024-01-25 14:57:12 +0000 top: Avoid printing a blank line when the ZFS ARC is empty PR: 275994 MFC after: 2 weeks (cherry picked from commit 1f62718d8ba26d813d8c2e826ac5f4caee4c6730) --- usr.bin/top/machine.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index b4cd29dab878..a76d77a80ce4 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -293,17 +293,27 @@ machine_init(struct statics *statics) size = sizeof(carc_en); if (arc_enabled && sysctlbyname("vfs.zfs.compressed_arc_enabled", &carc_en, &size, - NULL, 0) == 0 && carc_en == 1) - carc_enabled = 1; + NULL, 0) == 0 && carc_en == 1) { + uint64_t uncomp_sz; + + /* + * Don't report compression stats if no data is in the ARC. + * Otherwise, we end up printing a blank line. + */ + size = sizeof(uncomp_sz); + if (sysctlbyname("kstat.zfs.misc.arcstats.uncompressed_size", + &uncomp_sz, &size, NULL, 0) == 0 && uncomp_sz != 0) + carc_enabled = 1; + } kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open"); if (kd == NULL) return (-1); size = sizeof(nswapdev); - if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, - 0) == 0 && nswapdev != 0) - has_swap = 1; + if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, 0) == 0 && + nswapdev != 0) + has_swap = 1; GETSYSCTL("kern.ccpu", ccpu); From nobody Thu Jan 25 15:03:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLPG03SDwz57QXG; Thu, 25 Jan 2024 15: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 4TLPG0326Vz4q88; Thu, 25 Jan 2024 15: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=1706194984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rgn4prWIxne8r9YDS8XnF/chn+3R8Qzt5r2O18GWIlY=; b=xU0CouqKtAdqL/xGW8KLNk6R0ncPcO1z99fRM4MLEse/250J2cD2I0xpC8YC7/6AMZpm3g 6L0FdU2TzFf4dSQx7r+j3bnUAtxVmkKeFI/KksIv7/1XAdiLnSSKym+SrqRWg3xJXDg1F/ b/0nbOh1VSvAmwLHKEiLllOTpR9J+kTQ5P0B/n4O7wSX30661DnnYngzUZAIn/WH/zV/Qy Td/BUeJHC0JyaS+gu47vRBEUJFmtIW+raBiVtU6w1D6zxdLHHW1CSZvnqhpEX58EPV9DV8 7PMUR1bt6caw3MRioOqnLu9BJJx6n9mdxSaA37yL5R5Wwy/jAqb5TeuO44nm3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706194984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rgn4prWIxne8r9YDS8XnF/chn+3R8Qzt5r2O18GWIlY=; b=CA/oOCsAoKfAJV/XUXnnUf/B8Tt+hZC8OZKO+8ZURStyLwmZfiIAZ9k2WjYfaj7+XSEiaq 410d3dLowXxvywy9uDT675CyKrDSmnwbYHyouYw9AGXTT9M5ck4lP7cDndZPD2nkPPcVgQ OSv0EB2fUEAT6DqyyGtIlPQ5l7dox/N1C4OJ/gFdfZbG4tzOkjJEPoNJCnocR+WMSI6gLi Mb/tM3ueaMDry3jTjIFsNdUX86GoNzIuScgJGIgIK/dyLQ1EsY0J1IAXMU3/LIyQuWTW40 Aq0d2p6qOoJsmEqEeT5z5FVJeQCLNQ0QBfdBtvT7Ii0574Zawoyh323wYgD/oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706194984; a=rsa-sha256; cv=none; b=k2annLd217tsvmQ8tDQ1Gt3isT8m/mm1DNPKe/LkUFZb9gLfuopnmlbf0EP5n0wZFv7FPT G7Y3NmBozMR2FD3Jzci4+b9hjHqony7D/0q1HGxIWXRypbQJ1Jr3p+zl4U/gCJX84HIH45 Drx4bFHgjH+I+L8Qe0k8kNvPwoEtvIHdRtc0FeUokChSykxGQ6v0I8uMZDmxZmDAX2IV9Y 3ZXnQCmsUPmO8lR+WmED4Yg9SGyB+KxeuvbQVuNOZxQKn75nEdJsc2QXaOMQ5z3lZwJYhd 8/witgUzpKiPq0jtr9sQi+feVqEJNMnIG8LCpzLMbhGCNpLI62f9u970xylCsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLPG0264Hz12yZ; Thu, 25 Jan 2024 15: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 40PF34iu057365; Thu, 25 Jan 2024 15: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 40PF34ck057362; Thu, 25 Jan 2024 15:03:04 GMT (envelope-from git) Date: Thu, 25 Jan 2024 15:03:04 GMT Message-Id: <202401251503.40PF34ck057362@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: f4524aff6d66 - stable/13 - top: Avoid printing a blank line when the ZFS ARC is empty List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f4524aff6d66edbfb7b3f184118b0a4299c4b1af Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f4524aff6d66edbfb7b3f184118b0a4299c4b1af commit f4524aff6d66edbfb7b3f184118b0a4299c4b1af Author: Mark Johnston AuthorDate: 2024-01-11 14:58:31 +0000 Commit: Mark Johnston CommitDate: 2024-01-25 14:58:44 +0000 top: Avoid printing a blank line when the ZFS ARC is empty PR: 275994 MFC after: 2 weeks (cherry picked from commit 1f62718d8ba26d813d8c2e826ac5f4caee4c6730) --- usr.bin/top/machine.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index b4cd29dab878..a76d77a80ce4 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -293,17 +293,27 @@ machine_init(struct statics *statics) size = sizeof(carc_en); if (arc_enabled && sysctlbyname("vfs.zfs.compressed_arc_enabled", &carc_en, &size, - NULL, 0) == 0 && carc_en == 1) - carc_enabled = 1; + NULL, 0) == 0 && carc_en == 1) { + uint64_t uncomp_sz; + + /* + * Don't report compression stats if no data is in the ARC. + * Otherwise, we end up printing a blank line. + */ + size = sizeof(uncomp_sz); + if (sysctlbyname("kstat.zfs.misc.arcstats.uncompressed_size", + &uncomp_sz, &size, NULL, 0) == 0 && uncomp_sz != 0) + carc_enabled = 1; + } kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open"); if (kd == NULL) return (-1); size = sizeof(nswapdev); - if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, - 0) == 0 && nswapdev != 0) - has_swap = 1; + if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, 0) == 0 && + nswapdev != 0) + has_swap = 1; GETSYSCTL("kern.ccpu", ccpu); From nobody Thu Jan 25 17:08:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLS2d1X1Mz57dXH; Thu, 25 Jan 2024 17:08: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 4TLS2d0wHCz59P2; Thu, 25 Jan 2024 17:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706202505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SwmkBUZjrJzUQZmCVPjXq4rnIIjvCVzo7eorz82m8ls=; b=m9qpexH+5yCQSVf5JplVblBjCPoGHZRx8qcVe6ghNM6CXaAigMDpScvSGog492whpAjYBH /WtQtmVuXPr3KMiTn48+v7cHcAMa4za88cI/vnv+iwW5qnHFQcdcDoJSvaVQl0RrSsZYdK YKt1aEWFAF6vfAeWp+9LGcEFT3xdl1QJBdTRq9wEZCorYUf4wbu8mESM7/Nr+2UDvyx+RC vnB4nTZVLfk796CcJf5MMPo73Cg1BEA0MMu5MZPSqnBvy+FFDjhh1cEHbN8nl4VFnkmhLl OA773VKegwEQyDWX26FM7ZY06qeODDEkQMfSZuSsa916lLogf/pHBgPkpsT/Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706202505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SwmkBUZjrJzUQZmCVPjXq4rnIIjvCVzo7eorz82m8ls=; b=kEgpeRkoAVfkPa9mAsAorCFNxtGR954eWz9Cm+cRGb7ZlpZOFv6SbPi3A0FngxeJ/dB+tW Gbyrf4z/gUqgJ/blEJh+tWuD0N9eHp9fUrNpbCgMrlD5JdGPXO598ONs/RVQDtp7PBlbUq Ukzr7x+jz5u1fagcNNSVIlmSdXckFMfDdWtrb5Jo22jzEVJJ5VvMlak9iy7v3XcG1tShxC py2ghQpMEPPfPY5QJNBApo+JN5HZGVD5HV1NqZ8oQMes/fL/1oyHYl7INDEpEE9USRih95 TmdTfiOtwms6XjOZqq4LqSyl2c6w2hEN7xUYURx6qjTwtxNPSPnuvzRZJ32dYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706202505; a=rsa-sha256; cv=none; b=cSyUDI4SQV/jSEHqrOBMSF0tURrP2jWgn1Ly4xS1nm6TzuqYkrrT6eYhZcTuL3ZlYGbiw0 fxKwsW2nIa8i0x25dia+qmBZEhe6B702uGu2ML68UhqFwPR4D1nTmVIFFqn9XxiUrdnnn+ 4DtfdixcOcBQoikG2Fbmd+g5LD28Y0icpfjvO2IKT4spkVNRwwIviOP5jqHVlsj7jsjMmf wregpyBPGKYgsvW3daGK5X7jxGQwubq1ED33b0BkB13uVvA8iFqig41jsptUDlhHI6NDpV me24w2BnRsuDUmEONYr7L0+y5aUPLY3YWmhzJ2wvrSO3vpNM56b6f+tYH1kXSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLS2d01f2z15kl; Thu, 25 Jan 2024 17:08: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 40PH8OHv060523; Thu, 25 Jan 2024 17:08:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PH8OTb060520; Thu, 25 Jan 2024 17:08:24 GMT (envelope-from git) Date: Thu, 25 Jan 2024 17:08:24 GMT Message-Id: <202401251708.40PH8OTb060520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: e95025ed9388 - main - pflow: show socket status in verbose mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e95025ed93886dc854c2c92a2d2812cb51abf4ed Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e95025ed93886dc854c2c92a2d2812cb51abf4ed commit e95025ed93886dc854c2c92a2d2812cb51abf4ed Author: Kristof Provost AuthorDate: 2024-01-25 16:37:51 +0000 Commit: Kristof Provost CommitDate: 2024-01-25 16:37:51 +0000 pflow: show socket status in verbose mode Introduce a verbose output mode to pflowctl, and expose the status of the socket to userspace. This can be helpful in debugging configuration errors. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pflowctl/pflowctl.8 | 5 ++++- sbin/pflowctl/pflowctl.c | 52 ++++++++++++++++++++++++++++++++++++++++++------ sys/net/pflow.h | 3 ++- sys/netpfil/pf/pflow.c | 1 + 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/sbin/pflowctl/pflowctl.8 b/sbin/pflowctl/pflowctl.8 index 446679486db6..8c4142f31396 100644 --- a/sbin/pflowctl/pflowctl.8 +++ b/sbin/pflowctl/pflowctl.8 @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 08 2024 $ +.Dd $Mdocdate: January 25 2024 $ .Dt PFLOWCTL 8 .Os .Sh NAME @@ -24,6 +24,7 @@ .Sh SYNOPSIS .Nm pflowctl .Bk -words +.Op Fl v .Op Fl lc .Op Fl d Ar id .Op Fl s Ar id ... @@ -40,6 +41,8 @@ The utility provides several commands. The options are as follows: .Bl -tag -width Ds +.It Fl v +Produce verbose output. .It Fl c Create a new .Xr pflow 4 diff --git a/sbin/pflowctl/pflowctl.c b/sbin/pflowctl/pflowctl.c index e5dd3df7e6a7..f6ca8980db1b 100644 --- a/sbin/pflowctl/pflowctl.c +++ b/sbin/pflowctl/pflowctl.c @@ -47,13 +47,15 @@ static int get(int id); +static bool verbose = false; + extern char *__progname; static void usage(void) { fprintf(stderr, -"usage: %s [-lc] [-d id] [-s id ...]\n", +"usage: %s [-lc] [-d id] [-s id ...] [-v]\n", __progname); exit(1); @@ -253,6 +255,7 @@ struct pflowctl_get { struct pflowctl_sockaddr src; struct pflowctl_sockaddr dst; uint32_t obs_dom; + uint8_t so_status; }; #define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct pflowctl_get, _field) @@ -262,6 +265,7 @@ static struct snl_attr_parser ap_get[] = { { .type = PFLOWNL_GET_SRC, .off = _OUT(src), .arg = &sockaddr_parser, .cb = snl_attr_get_nested }, { .type = PFLOWNL_GET_DST, .off = _OUT(dst), .arg = &sockaddr_parser, .cb = snl_attr_get_nested }, { .type = PFLOWNL_GET_OBSERVATION_DOMAIN, .off = _OUT(obs_dom), .cb = snl_attr_get_uint32 }, + { .type = PFLOWNL_GET_SOCKET_STATUS, .off = _OUT(so_status), .cb = snl_attr_get_uint8 }, }; static struct snl_field_parser fp_get[] = {}; #undef _IN @@ -344,6 +348,10 @@ get(int id) print_sockaddr(" src ", &g.src.storage); print_sockaddr(" dst ", &g.dst.storage); printf("\n"); + if (verbose) { + printf("\tsocket: %s\n", + g.so_status ? "connected" : "disconnected"); + } } if (e.error) @@ -533,10 +541,20 @@ static const struct snl_hdr_parser *all_parsers[] = { &get_parser, }; +enum pflowctl_op_t { + OP_HELP, + OP_LIST, + OP_CREATE, + OP_DELETE, + OP_SET, +}; int main(int argc, char *argv[]) { int ch; + enum pflowctl_op_t op = OP_HELP; + char **set_args = NULL; + size_t set_arg_count = 0; SNL_VERIFY_PARSERS(all_parsers); @@ -544,18 +562,40 @@ main(int argc, char *argv[]) usage(); while ((ch = getopt(argc, argv, - "lcd:s:")) != -1) { + "lcd:s:v")) != -1) { switch (ch) { case 'l': - return (list()); + op = OP_LIST; + break; case 'c': - return (create()); + op = OP_CREATE; + break; case 'd': - return (del(optarg)); + op = OP_DELETE; + break; case 's': - return (set(optarg, argc - optind, argv + optind)); + op = OP_SET; + set_arg_count = argc - optind; + set_args = argv + optind; + case 'v': + verbose = true; + break; } } + switch (op) { + case OP_LIST: + return (list()); + case OP_CREATE: + return (create()); + case OP_DELETE: + return (del(optarg)); + case OP_SET: + return (set(optarg, set_arg_count, set_args)); + case OP_HELP: + usage(); + break; + } + return (0); } diff --git a/sys/net/pflow.h b/sys/net/pflow.h index 4c194e14e001..ee747d1a6a46 100644 --- a/sys/net/pflow.h +++ b/sys/net/pflow.h @@ -362,7 +362,8 @@ enum pflow_get_type_t { PFLOWNL_GET_VERSION = 2, /* u16 */ PFLOWNL_GET_SRC = 3, /* struct sockaddr_storage */ PFLOWNL_GET_DST = 4, /* struct sockaddr_storage */ - PFLOWNL_GET_OBSERVATION_DOMAIN = 5, /* u32 */ + PFLOWNL_GET_OBSERVATION_DOMAIN = 5, /* u32 */ + PFLOWNL_GET_SOCKET_STATUS = 6, /* u8 */ }; enum pflow_set_type_t { diff --git a/sys/netpfil/pf/pflow.c b/sys/netpfil/pf/pflow.c index 17a68e0d9e57..f3dba7687d05 100644 --- a/sys/netpfil/pf/pflow.c +++ b/sys/netpfil/pf/pflow.c @@ -1485,6 +1485,7 @@ pflow_nl_get(struct nlmsghdr *hdr, struct nl_pstate *npt) nlattr_add_sockaddr(nw, PFLOWNL_GET_DST, sc->sc_flowdst); nlattr_add_u32(nw, PFLOWNL_GET_OBSERVATION_DOMAIN, sc->sc_observation_dom); + nlattr_add_u8(nw, PFLOWNL_GET_SOCKET_STATUS, sc->so != NULL); if (! nlmsg_end(nw)) { nlmsg_abort(nw); From nobody Thu Jan 25 17:18:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLSFt1nqBz57fQP for ; Thu, 25 Jan 2024 17:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLSFt0PWzz3xpT; Thu, 25 Jan 2024 17:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706203090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4R++wxf6o6iy2rhg6DZFKlqGZPNtyESC8Kh4edTG6g=; b=Kk1+pmFfvnybNNqEITZGMRq4y6rtUUBgC6d87HTbwo0OYrLRjBlQfiw2nwq0ot0mOgbMpA fBUQ6kII30o5gDrKn4/7ILD5hKVXkaL60lHavV2+0JeFiu1s22+wbB3KF4Nqv8n2srrqnK IZodcAPY/y72JKTV6OxryCuYrTozta/JpNEwnYhQliKRcuIqImTTJdPiauO4dZO/eeKt4Y 0n83O+Gzr0Rgrqr68Izuqz9gbLGTEUg/DCTkVgt0fa2X7UNKU3AeOPwkzc/iRYIiPnq1wL nCGvvT/zGoY5ceQtfGW0pb6PtX3YLCcYTeFraSGR2T0cVDUtXGvWY75GkGIcWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706203090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4R++wxf6o6iy2rhg6DZFKlqGZPNtyESC8Kh4edTG6g=; b=kirY04uxcNOYn2hDPiiXyiGczze37wWOYVmEsmqMXHmVHfwdBqH3arVV3dGy3AzB6jRFOT 5/TKhZHX2ZsOELeF5xiqPrBTCnVJYKmcoA0PzEpkd3NXO/Sg6beU9AGRj273iyBrqbJQEo br2cZnIRAbgiMFYo2lSb5ZUlxTN41m5LvHOHxay1jVEclmWTiMnkc3/Rn5Cn0RtyzZFgs4 +vmYHefiFi/tfDOvAQG/3QcVvb1iEPUqBiQ6gpz0DC2pmSxKwJweVpKlK9mJv5waRQrqm6 1eGw6aq0DLgwFM8q+rrKR6yYvxYQbwjMkX0qz+40k90tph9i5dpN9HF2GvfG8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706203090; a=rsa-sha256; cv=none; b=Y6kSrnDHab2L4bpeAq2LW6Rg/PPS0JdC5X5++qtivNG+kxIoPdn0FcMYcSE5y15ugKG1go AqdJldB55HtDqTcNTG8fnUVzyal1RkyzMbeHlIFX9UXmVxVAxS6PYvfFKeHqNopkxTUk0A uKp1Krm+zTXqP7p/4d87RqE4MbP1CR0m/NXSkGCPsyaXIAs1IEw4Q3piVgvfdvJmEhFVX8 WGZ0OohgW9/NjdbXHgxhyqHV6xInFvt89NG7npTqiWUUMkLmBG2uXtPzeZveSq5d9trDYy pL0tCyWFPb3j17Cs8zIeahEwmlmxBlu3LZ77Rvik0ro0HnKicF1nBdjiAwvvtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLSFs6ZXgz15fF; Thu, 25 Jan 2024 17:18: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 40PHI9Ou077249; Thu, 25 Jan 2024 17:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PHI9v1077248; Thu, 25 Jan 2024 17:18:09 GMT (envelope-from git) Date: Thu, 25 Jan 2024 17:18:09 GMT Message-Id: <202401251718.40PHI9v1077248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: a69400892f7d - Create tag vendor/libcxxrt/2024-01-25-fd484be8d1e94a1fcf6bc5c67e5c07b65ada19b6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/libcxxrt/2024-01-25-fd484be8d1e94a1fcf6bc5c67e5c07b65ada19b6 X-Git-Reftype: annotated tag X-Git-Commit: a69400892f7d31d24ed179281e5e0c4a885f4373 Auto-Submitted: auto-generated The annotated tag vendor/libcxxrt/2024-01-25-fd484be8d1e94a1fcf6bc5c67e5c07b65ada19b6 has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/libcxxrt/2024-01-25-fd484be8d1e94a1fcf6bc5c67e5c07b65ada19b6 tag vendor/libcxxrt/2024-01-25-fd484be8d1e94a1fcf6bc5c67e5c07b65ada19b6 Tagger: Dimitry Andric TaggerDate: 2024-01-25 17:17:08 +0000 Tag libcxxrt master fd484be8d1e94a1fcf6bc5c67e5c07b65ada19b6. commit 156745f575946b366c430fc2bc7b9a90d5925b29 Author: Dimitry Andric AuthorDate: 2024-01-25 17:05:41 +0000 Commit: Dimitry Andric CommitDate: 2024-01-25 17:05:41 +0000 Import libcxxrt master 03c83f5a57be8c5b1a29a68de5638744f17d28ba Interesting fixes: 03c83f5 add __cxa_init_primary_exception (#23) 5d8a158 Fix two bugs in __cxa_end_cleanup() b00c6c5 Insert padding in __cxa_dependent_exception 45ca8b1 Insert padding in __cxa_exception struct for compatibility f2e5509 Fix unlock in two-word version and add missing comment. 6229590 Add an option for disabling emergency buffers. (#14) From nobody Thu Jan 25 17:44:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLSqy2xrkz57hTw; Thu, 25 Jan 2024 17:44: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 4TLSqy1sF3z43Cr; Thu, 25 Jan 2024 17:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706204654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jtdC0QW/Z4VjTCtB66xzAg3M5QlT8Jla3vxGkXg02QQ=; b=IAIjjsLH+iVDGU3f8lqcQsx2pApLqEp+XTGzPvPYhRiePYLK7EJfSWbyDCH1db0C3xpBqk GZ8Mh7BS2iTTH890IlNhqEdRpZZBIuAv8vvlMM9hcr1P4rVcxb7nyX7w0OcxjKn1CNnhnS onuNF882ok2Z7sF2tpKUXTF0k082PgWabTg6l1zAXrZpiQJdIyojvtyam9aoPRcmoSUGTQ B9oQfzFt2irr3DUAvByhYh7wpMTrvyoaXavKIEqDVJefRjjpcJYeKB2hfi6hsgMu4Yhyjm +5oCQt/0fGeFjM/YDpsw5E8OVx8/+L9SZqSMF1bDZ/wxT8Mi56z9NsfIWc4btg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706204654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jtdC0QW/Z4VjTCtB66xzAg3M5QlT8Jla3vxGkXg02QQ=; b=MEQQyV5USnOzUH3hickS6BOu1iKJkmxPue4YfEh9jqVmjJuoTDSsJHsj0L5fPKeseWiGEJ aeyVFU7zYm71bsPGjjcr/QZKqzeXKfUbwjk3AgIFD77oCT1kllBUgIWTgvRmhHrdTILlBT 9IOSktQUNo9p4hpBoVmpb4fvDuC/nCdH7SCPAidKD6MU4yXlGamDW6Vy30jYYpWmtxBoqB RR0iAnoqvwN4qyEjGpxxkrs+/E/fd3EPcrX/sE6zN+wokKBD83lXrbPniVCvOBk4l5Rl84 XXq5SFU/qsLHmvj7Hsz/ZB7LBqWMpgc/B5cSdZSGq/+Y7iia9Tn6jW95M0qFgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706204654; a=rsa-sha256; cv=none; b=G4ll5/o7yJE2lkw4ThjqwZvlgZlB/3z6uDabymzr/ND7TFKhZmnmAMDSerAdazaHeVOkLe BIsOd0rWTKVcJ8U7C9z6l7ryBoY2XQ7uPpfhWMxSwOEHUUMhgbjngblrZFMZX2w/kjrDsA V4ArReGOBmT7EPd4mcx4SH//OTXiJKMlGjDjcAdalgBsKseH9qM+Z541it24PleGOKRjTz lQL1Z24RfO8h+tG6lwG0c8SnCd4CTEulFw+tgr1dTiS5UXRtDT1PF7sQJPICat5ukDnfIo 97H3aLznWHKwyXnir3zAIt/fTVwl/kLFiTzvDgHPKGBxynmw0YnqBLrgcV+Agw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLSqy0w0Dz16GD; Thu, 25 Jan 2024 17:44: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 40PHiEU5027803; Thu, 25 Jan 2024 17:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PHi9N8027797; Thu, 25 Jan 2024 17:44:09 GMT (envelope-from git) Date: Thu, 25 Jan 2024 17:44:09 GMT Message-Id: <202401251744.40PHi9N8027797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ecf410623750 - main - Merge libcxxrt master 03c83f5a57be8c5b1a29a68de5638744f17d28ba List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecf4106237505fa9459ae871793b754334989c17 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ecf4106237505fa9459ae871793b754334989c17 commit ecf4106237505fa9459ae871793b754334989c17 Merge: e95025ed9388 156745f57594 Author: Dimitry Andric AuthorDate: 2024-01-25 17:41:44 +0000 Commit: Dimitry Andric CommitDate: 2024-01-25 17:43:23 +0000 Merge libcxxrt master 03c83f5a57be8c5b1a29a68de5638744f17d28ba Interesting fixes (* were already cherry-picked): - 03c83f5 add __cxa_init_primary_exception (#23) * 5d8a158 Fix two bugs in __cxa_end_cleanup() * b00c6c5 Insert padding in __cxa_dependent_exception * 45ca8b1 Insert padding in __cxa_exception struct for compatibility * f2e5509 Fix unlock in two-word version and add missing comment. - 6229590 Add an option for disabling emergency buffers. (#14) MFC after: 2 weeks contrib/libcxxrt/cxxabi.h | 8 ++++++++ contrib/libcxxrt/exception.cc | 44 +++++++++++++++++++++++++++++++++++-------- lib/libcxxrt/Version.map | 4 ++++ 3 files changed, 48 insertions(+), 8 deletions(-) diff --cc lib/libcxxrt/Version.map index 0d2dccbe2670,000000000000..a54b6a4daad5 mode 100644,000000..100644 --- a/lib/libcxxrt/Version.map +++ b/lib/libcxxrt/Version.map @@@ -1,394 -1,0 +1,398 @@@ +# Define the same version as the libsupc++ from gcc 4.2.1 so that we can use +# libcxxrt as a drop-in replacement. + +CXXABI_1.3 { + + global: + + # ABI functions with C linkage + __cxa_allocate_exception; + __cxa_bad_cast; + __cxa_bad_typeid; + __cxa_begin_catch; + __cxa_begin_cleanup; + __cxa_call_unexpected; + __cxa_current_exception_type; + __cxa_demangle; + __cxa_end_catch; + __cxa_end_cleanup; + __cxa_free_exception; + __cxa_get_globals; + __cxa_get_globals_fast; + __cxa_guard_abort; + __cxa_guard_acquire; + __cxa_guard_release; + __cxa_pure_virtual; + __cxa_rethrow; + __cxa_throw; + __cxa_throw_bad_array_new_length; + __cxa_type_match; + __cxa_vec_cctor; + __cxa_vec_cleanup; + __cxa_vec_ctor; + __cxa_vec_delete2; + __cxa_vec_delete3; + __cxa_vec_delete; + __cxa_vec_dtor; + __cxa_vec_new2; + __cxa_vec_new3; + __cxa_vec_new; + __dynamic_cast; + __gxx_personality_sj0; + __gxx_personality_v0; + + extern "C++" { + # Type info classes and their destructors + "__cxxabiv1::__array_type_info"; + "__cxxabiv1::__array_type_info::~__array_type_info()"; + "__cxxabiv1::__class_type_info"; + "__cxxabiv1::__class_type_info::~__class_type_info()"; + "__cxxabiv1::__enum_type_info"; + "__cxxabiv1::__enum_type_info::~__enum_type_info()"; + "__cxxabiv1::__function_type_info::"; + "__cxxabiv1::__function_type_info::~__function_type_info()"; + "__cxxabiv1::__fundamental_type_info"; + "__cxxabiv1::__fundamental_type_info::~__fundamental_type_info()"; + "__cxxabiv1::__pbase_type_info"; + "__cxxabiv1::__pbase_type_info::~__pbase_type_info()"; + "__cxxabiv1::__pointer_to_member_type_info"; + "__cxxabiv1::__pointer_to_member_type_info::~__pointer_to_member_type_info()"; + "__cxxabiv1::__pointer_type_info"; + "__cxxabiv1::__pointer_type_info::~__pointer_type_info()"; + "__cxxabiv1::__si_class_type_info"; + "__cxxabiv1::__si_class_type_info::~__si_class_type_info()"; + "__cxxabiv1::__vmi_class_type_info"; + "__cxxabiv1::__vmi_class_type_info::~__vmi_class_type_info()"; + + # vtables typeinfo classes. + "vtable for __cxxabiv1::__array_type_info"; + "vtable for __cxxabiv1::__class_type_info"; + "vtable for __cxxabiv1::__enum_type_info"; + "vtable for __cxxabiv1::__function_type_info"; + "vtable for __cxxabiv1::__fundamental_type_info"; + "vtable for __cxxabiv1::__pbase_type_info"; + "vtable for __cxxabiv1::__pointer_to_member_type_info"; + "vtable for __cxxabiv1::__pointer_type_info"; + "vtable for __cxxabiv1::__si_class_type_info"; + "vtable for __cxxabiv1::__vmi_class_type_info"; + + # Type info for built-in types + "typeinfo for bool const*"; + "typeinfo for bool"; + "typeinfo for char const*"; + "typeinfo for char"; + "typeinfo for double const*"; + "typeinfo for double"; + "typeinfo for float const*"; + "typeinfo for float"; + "typeinfo for int const*"; + "typeinfo for int"; + "typeinfo for long const*"; + "typeinfo for long double const*"; + "typeinfo for long double"; + "typeinfo for long long const*"; + "typeinfo for long long"; + "typeinfo for long"; + "typeinfo for short const*"; + "typeinfo for short"; + "typeinfo for signed char const*"; + "typeinfo for signed char"; + "typeinfo for unsigned char const*"; + "typeinfo for unsigned char"; + "typeinfo for unsigned int const*"; + "typeinfo for unsigned int"; + "typeinfo for unsigned long const*"; + "typeinfo for unsigned long long const*"; + "typeinfo for unsigned long long"; + "typeinfo for unsigned long"; + "typeinfo for unsigned short const*"; + "typeinfo for unsigned short"; + "typeinfo for void const*"; + "typeinfo for void"; + "typeinfo for wchar_t const*"; + "typeinfo for wchar_t"; + + "typeinfo for bool*"; + "typeinfo for wchar_t*"; + "typeinfo for short*"; + "typeinfo for char*"; + "typeinfo for unsigned char*"; + "typeinfo for long long*"; + "typeinfo for unsigned short*"; + "typeinfo for long*"; + "typeinfo for double*"; + "typeinfo for unsigned long*"; + "typeinfo for unsigned long long*"; + "typeinfo for int*"; + "typeinfo for long double*"; + "typeinfo for signed char*"; + "typeinfo for void*"; + "typeinfo for unsigned int*"; + "typeinfo for float*"; + + "typeinfo for __cxxabiv1::__array_type_info"; + "typeinfo for __cxxabiv1::__class_type_info"; + "typeinfo for __cxxabiv1::__enum_type_info"; + "typeinfo for __cxxabiv1::__function_type_info"; + "typeinfo for __cxxabiv1::__fundamental_type_info"; + "typeinfo for __cxxabiv1::__pbase_type_info"; + "typeinfo for __cxxabiv1::__pointer_to_member_type_info"; + "typeinfo for __cxxabiv1::__pointer_type_info"; + "typeinfo for __cxxabiv1::__si_class_type_info"; + "typeinfo for __cxxabiv1::__vmi_class_type_info"; + + # Typeinfo names. + + "typeinfo name for unsigned char const*"; + "typeinfo name for long const*"; + "typeinfo name for double const*"; + "typeinfo name for unsigned long long const*"; + "typeinfo name for unsigned short const*"; + "typeinfo name for char const*"; + "typeinfo name for long long const*"; + "typeinfo name for short const*"; + "typeinfo name for unsigned int const*"; + "typeinfo name for float const*"; + "typeinfo name for bool const*"; + "typeinfo name for wchar_t const*"; + "typeinfo name for int const*"; + "typeinfo name for unsigned long const*"; + "typeinfo name for void const*"; + "typeinfo name for long double const*"; + "typeinfo name for signed char const*"; + "typeinfo name for wchar_t"; + "typeinfo name for short"; + "typeinfo name for char"; + "typeinfo name for float"; + "typeinfo name for void"; + "typeinfo name for unsigned int"; + "typeinfo name for bool"; + "typeinfo name for signed char"; + "typeinfo name for long double"; + "typeinfo name for int"; + "typeinfo name for unsigned long long"; + "typeinfo name for unsigned long"; + "typeinfo name for unsigned char"; + "typeinfo name for long"; + "typeinfo name for long long"; + "typeinfo name for unsigned short"; + "typeinfo name for double"; + + "typeinfo name for bool*"; + "typeinfo name for wchar_t*"; + "typeinfo name for short*"; + "typeinfo name for char*"; + "typeinfo name for unsigned char*"; + "typeinfo name for long long*"; + "typeinfo name for unsigned short*"; + "typeinfo name for long*"; + "typeinfo name for double*"; + "typeinfo name for unsigned long*"; + "typeinfo name for unsigned long long*"; + "typeinfo name for int*"; + "typeinfo name for long double*"; + "typeinfo name for signed char*"; + "typeinfo name for void*"; + "typeinfo name for unsigned int*"; + "typeinfo name for float*"; + + "typeinfo name for __cxxabiv1::__array_type_info"; + "typeinfo name for __cxxabiv1::__class_type_info"; + "typeinfo name for __cxxabiv1::__enum_type_info"; + "typeinfo name for __cxxabiv1::__function_type_info"; + "typeinfo name for __cxxabiv1::__fundamental_type_info"; + "typeinfo name for __cxxabiv1::__pbase_type_info"; + "typeinfo name for __cxxabiv1::__pointer_to_member_type_info"; + "typeinfo name for __cxxabiv1::__pointer_type_info"; + "typeinfo name for __cxxabiv1::__si_class_type_info"; + "typeinfo name for __cxxabiv1::__vmi_class_type_info"; + + "std::type_info::type_info(std::type_info const&)"; + "std::type_info::operator=(std::type_info const&)"; + + + # Extensions + "pathscale::set_terminate(void (*)())"; + "pathscale::set_unexpected(void (*)())"; + "pathscale::set_use_thread_local_handlers(bool)"; + }; + + # C++11 typeinfo not understood by ld.bfd 2.17.50 + # std::nullptr_t + _ZTIDn;_ZTIPDn;_ZTIPKDn; + # char16_t + _ZTIDi;_ZTIPDi;_ZTIPKDi; + # char32_t + _ZTIDs;_ZTIPDs;_ZTIPKDs; + # IEEE 754r decimal floating point + _ZTIDd;_ZTIPDd;_ZTIPKDd; + _ZTIDe;_ZTIPDe;_ZTIPKDe; + _ZTIDf;_ZTIPDf;_ZTIPKDf; + # IEEE 754r half-precision floating point + _ZTIDh;_ZTIPDh;_ZTIPKDh; + + # C++11 typeinfo name not understood by ld.bfd 2.17.50 + # std::nullptr_t + _ZTSDn;_ZTSPDn;_ZTSPKDn; + # char16_t + _ZTSDi;_ZTSPDi;_ZTSPKDi; + # char32_t + _ZTSDs;_ZTSPDs;_ZTSPKDs; + # IEEE 754r decimal floating point + _ZTSDd;_ZTSPDd;_ZTSPKDd; + _ZTSDe;_ZTSPDe;_ZTSPKDe; + _ZTSDf;_ZTSPDf;_ZTSPKDf; + # IEEE 754r half-precision floating point + _ZTSDh;_ZTSPDh;_ZTSPKDh; + + local: + *; +}; + +CXXABI_1.3.1 { + __cxa_get_exception_ptr; +} CXXABI_1.3; + +CXXABI_1.3.5 { + extern "C++" { + "typeinfo for __int128 const*"; + "typeinfo for __int128"; + "typeinfo for __int128*"; + "typeinfo for unsigned __int128 const*"; + "typeinfo for unsigned __int128"; + "typeinfo for unsigned __int128*"; + }; +} CXXABI_1.3.1; + +CXXABI_1.3.6 { + __cxa_deleted_virtual; +} CXXABI_1.3.5; + +CXXABI_1.3.9 { + extern "C++" { + "typeinfo name for __int128 const*"; + "typeinfo name for __int128"; + "typeinfo name for __int128*"; + "typeinfo name for unsigned __int128 const*"; + "typeinfo name for unsigned __int128"; + "typeinfo name for unsigned __int128*"; + "operator delete[](void*, unsigned int)"; + "operator delete(void*, unsigned int)"; + "operator delete[](void*, unsigned long)"; + "operator delete(void*, unsigned long)"; + }; +} CXXABI_1.3.6; + ++CXXABI_1.3.11 { ++ __cxa_init_primary_exception; ++} CXXABI_1.3.9; ++ +CXXRT_1.0 { + + extern "C++" { + "std::type_info::name() const"; + "std::type_info::before(std::type_info const&) const"; + "std::type_info::operator==(std::type_info const&) const"; + "std::type_info::operator!=(std::type_info const&) const"; + "std::bad_cast::bad_cast(std::bad_cast const&)"; + "std::bad_cast::bad_cast()"; + "std::bad_cast::operator=(std::bad_cast const&)"; + "std::bad_typeid::bad_typeid(std::bad_typeid const&)"; + "std::bad_typeid::bad_typeid()"; + "std::bad_typeid::operator=(std::bad_typeid const&)"; + "std::exception::exception(std::exception const&)"; + "std::exception::exception()"; + "std::exception::operator=(std::exception const&)"; + "std::bad_alloc::bad_alloc(std::bad_alloc const&)"; + "std::bad_alloc::bad_alloc()"; + "std::bad_alloc::operator=(std::bad_alloc const&)"; + "std::bad_array_new_length::bad_array_new_length(std::bad_array_new_length const&)"; + "std::bad_array_new_length::bad_array_new_length()"; + "std::bad_array_new_length::operator=(std::bad_array_new_length const&)"; + + }; + __cxa_allocate_dependent_exception; + __cxa_current_primary_exception; + __cxa_decrement_exception_refcount; + __cxa_free_dependent_exception; + __cxa_increment_exception_refcount; + __cxa_rethrow_primary_exception; + +} CXXABI_1.3.6; + + +GLIBCXX_3.4 { + extern "C++" { + "operator delete[](void*)"; + "operator delete(void*)"; + "operator new[](unsigned int)"; + "operator new(unsigned int)"; + "operator new(unsigned int, std::nothrow_t const&)"; + "operator new[](unsigned long)"; + "operator new(unsigned long)"; + "operator new(unsigned long, std::nothrow_t const&)"; + + "std::unexpected()"; + "std::get_terminate()"; + "std::get_unexpected()"; + "std::uncaught_exception()"; + "std::terminate()"; + + "std::type_info::~type_info()"; + "std::bad_cast::~bad_cast()"; + "std::bad_typeid::~bad_typeid()"; + "std::exception::~exception()"; + "std::bad_alloc::~bad_alloc()"; + "std::bad_array_new_length::~bad_array_new_length()"; + + "std::exception::what() const"; + + std::set_new_handler*; + std::set_terminate*; + std::set_unexpected*; + std::type_info::__*; + + "vtable for std::bad_alloc"; + "vtable for std::bad_cast"; + "vtable for std::bad_typeid"; + "vtable for std::exception"; + "vtable for std::type_info"; + "vtable for std::bad_array_new_length"; + + "typeinfo for std::bad_alloc"; + "typeinfo for std::bad_typeid"; + "typeinfo for std::bad_cast"; + "typeinfo for std::exception"; + "typeinfo for std::type_info"; + "typeinfo for std::bad_array_new_length"; + "typeinfo name for std::bad_alloc"; + "typeinfo name for std::bad_typeid"; + "typeinfo name for std::bad_cast"; + "typeinfo name for std::exception"; + "typeinfo name for std::type_info"; + "typeinfo name for std::bad_array_new_length"; + + }; +}; + +GLIBCXX_3.4.9 { + extern "C++" { + "std::bad_typeid::what() const"; + "std::bad_cast::what() const"; + "std::bad_alloc::what() const"; + "std::bad_array_new_length::what() const"; + }; +} GLIBCXX_3.4; + +GLIBCXX_3.4.20 { + extern "C++" { + "std::get_new_handler()"; + }; +} GLIBCXX_3.4.9; + +GLIBCXX_3.4.22 { + extern "C++" { + "std::uncaught_exceptions()"; + }; +} GLIBCXX_3.4.20; + From nobody Thu Jan 25 18:04:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLTHF1fcQz57kL6 for ; Thu, 25 Jan 2024 18:04: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 4TLTHF0x8Sz45T9; Thu, 25 Jan 2024 18:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706205865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rO512Ys0iYWfS6V+qpXGRBEA9NynykOwix8AVFR2u08=; b=wXgFaqhOooAXuxtoTfO11Q6wsKK4aNFslTvZIMamf13/uUusGK1jO/IgWucGMfIVr6GFdp CKfS0NzohWjxgbNgZ9soEwe/+y8x5vcPBGuLG4uRCZP7VDiM2xBjcEcdQJNeR8jLSqLrvj YybfUQnkm2fEocj6KuIwuzg8DTvFl5m9GMwfYD+orVB54b/90en8lOon3l9ClPb4/egXET fbVPFAC6oHARtW4F9CYNA7hMN4Gi26sQpCzYdpLDFY/cACkLIE+TVYPwnkF0p7ootwnqf+ 6Uo40mYiQrUj3B1DqYMNgsOLQgVg6C8o+f2ySg5gRCLhXXXk0iUWGVPslpET6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706205865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rO512Ys0iYWfS6V+qpXGRBEA9NynykOwix8AVFR2u08=; b=ZA4FmQ8KozdJG9C3mcGqyOfRrc/LAoVuc/RSVLWzmj+wK9ZOOazG1QQtGu8cYQfts2svCF ylUTDtCxg7z4NcSk5zuFKEr/Whs30CQIHthyZ+dnmuIzT0ldpr9ewuLzgJXavExeeu/yDg E8xmHYPIZo1/u5gHBgbIqBxfU8VJ+wLQREYS18FZZCV8V8sWOcNbdPkZx62icDem1X0DQl soBQ9GY2xRz+bbeOoJ6c2q0AzYprfTx/uAgmELm5OQ+IzwBfrbUfbVyEOzgHhF+7Kh8jFE 3V6bZJIQ/+GE989CLDMXJqtvx72+HuITZYNwHT7+S977TejWp9Bmt9VN44JCUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706205865; a=rsa-sha256; cv=none; b=MTkZ2ubEVUEVcDmBfhLRwhfgqeWqhkUVqfuF2gW2YMyKG/EOq+aj/Dn9gW7zwzFd/4dDsA 85lt8v7NECwzyD8CaK+otKn9zE2OPcruvH3YJF6cgQubf5vSlFgbhPESQeqo5IaYIH7zdM xWQrGrLRUa9OYHwfvuIYAcihNb7lZXgCZ5CZbWeyIhTZr5OIMOF82qGJ30idjnuxPDPRT+ IKFGpW6+bxVF+1S0EnXS6xY1yj0uVEC4aCHPXeBt1vF/nICIuGcaYKhLQWnsn04YB/Gg9A rGZbz3dqkcdV4GR1uUZhL+E77HwiyQ0QXQrq4OY22Th2BhdeftJtIwgXHZyt/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLTHF001Pz1776; Thu, 25 Jan 2024 18:04: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 40PI4OEm062031; Thu, 25 Jan 2024 18:04:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PI4Owb062030; Thu, 25 Jan 2024 18:04:24 GMT (envelope-from git) Date: Thu, 25 Jan 2024 18:04:24 GMT Message-Id: <202401251804.40PI4Owb062030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 2d835ae86572 - vendor/llvm-project/release-18.x - vendor branch created List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/release-18.x X-Git-Reftype: branch X-Git-Commit: 2d835ae8657273e3aa8b9ef3201fb8df5563af9d X-Git-Oldrev: 0000000000000000000000000000000000000000 X-Git-Newrev: 2d835ae8657273e3aa8b9ef3201fb8df5563af9d Auto-Submitted: auto-generated The branch vendor/llvm-project/release-18.x has been created by dim: URL: https://cgit.FreeBSD.org/src/log/?id=2d835ae86572 009b1c42aa62 Import LLVM, at r72732. ec2b103c267a Import Clang, at r72732. 33a8e4360f50 Import LLVM, at r72770. 922a2097733e Import Clang, at r72770. 68eb509bdc5c Import LLVM, at r72805, which fixes PR4315 and PR4316. 2659aeb5e51f Import Clang, at r72805. f4fe016fa15f Import LLVM, at r72995. 37f6c480c696 Import clang, at r72995. d2a7037439ec Import LLVM r73021. 70b4596d9d0d Import Clang r73021. 93338c197185 Import LLVM r73070. 8ba99c00327a Import Clang r73070. 600c6fa13de5 Import LLVM r73340. 7ef7bab7e3d0 Import Clang r73340. b2f21fb044b6 Update LLVM sources to r73879. b897c8660c4f Update Clang sources to r73879. 0408e1d309a7 Import LLVM r73954. d6aff018d446 Import Clang r73954. f76359690a70 Import LLVM r73984. f698f7e71940 Import Clang r73984. f859468f5a21 Import LLVM r74383. 4ebdf5c4f587 Import Clang r74383. 18f153bdb9db Import LLVM 74788. 5362a71c02e7 Import Clang r74788. 59850d087442 Update llvm to r84119. 4c8b24812ddc Update clang to r84119. 98781354c33b Update clang to 84175. 26137f35958f Update llvm to r84175. 5cd822fa9bbb Delete all stale files. a505eb93f43f Delete stale files. a5f348eb914e Delete some more files. 4a142eb28942 Update LLVM to r84949. 73490b890977 Update clang to r84949. bd3c9c2e3e89 These files does not belong here. f9666f9b3a3d This was removed upstream. 36bf506ad3c9 Update LLVM to r86025. 51fb8b013e77 Update clang to r86025. fc25e9aa5245 Delete this file. 72cc50852bec Update LLVM to r86140. 8f57cb030523 Update clang to r86140. 907da171cc91 Update LLVM to r89205. b3d5a323a5ca Update clang to r89205. 7d4538633051 Update LLVM to r89337. f5bd02d290ff Update clang to r89337. 76e2e0ebfdd3 Remove includes that were removed upstream. 06f9d4012fb8 Update LLVM to r90226. 1569ce68681d Update clang to r90226. 571945e6affd Update LLVM to 91430. 34d02d0b37f1 Update clang to 91430. 1e7804dbd25b Update LLVM to 92395. abe15e553e58 Updaet clang to 92395. 829000e035f4 Update LLVM to 93512. ee791dde723a Update clang to r93512. 989df958a10f Update LLVM to r94309. 5044f5c816ad Update clang to r94309. 6fe5c7aa327e Update LLVM to r96341. ecb7e5c8afe9 Update clang to r96341. 67a71b3184ce Update LLVM to 97654. 79ade4e02893 Update clang to 97654. f5a3459adfde Update LLVM to r97873. dd5132ce2569 Update clang to r97873. ea5b2dd11c05 Update LLVM to r98164. a16e9ac1f192 Update clang to r98164. c69102774f97 Update LLVM to r98631. 4a37f65f1c13 Update clang to r98631. 2f12f10af369 Update LLVM to r99115. c0c7bca4e5b8 Update clang to r99115. 104bd8179fb5 Update LLVM to r100181. 11d2b2d2bb70 Update clang to r100181. b5efedaf2ab2 Update LLVM to r100285. 2c56c396ce59 Update clang to r100285. 9f4a1da9a0a5 Update LLVM to r100520. 60bfabcd8ce6 Update clang to r100520. d7f7719e5e08 Update LLVM to r103004. 0883ccd9eac3 Update clang to r103004. 59161dfae322 Update LLVM to r103052. be17651f5cd2 Update clang to r103052. abdf259d4871 Update LLVM to r104832. d7279c4c177b Update clang to r104832. 66e41e3c6e8b Update LLVM to r108243. 4ba675006b5a Update clang to r108243. *** 511 LINES SKIPPED *** From nobody Thu Jan 25 21:36:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLZ0K15ZYz585GR; Thu, 25 Jan 2024 21:36: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 4TLZ0K0WPGz4YMp; Thu, 25 Jan 2024 21:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706218609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zQz/YqqEzpTERjyc+1lzjX1LM19ZmTluaFIZJTxl/QI=; b=QfA6keiYqWW+5BJvPs1tGTevBZUK6a76XCZvs+xJhTr77MrHwL6uZwJOdJSaa0Di11DP44 1fC3TvWqaMJl50Kqnmo571fCmLUjIX6ytiVKFYIx5oTNukaTVL7t3yEhyqykux8q0Yln23 teLbrGypUItgRUuZlDA2/OhOaEvWgLkrZhdHudlXS0oIl8nHq3bMsyRULOZNpoYUpnvNpU TYe+mVH+LgpF/bd8VtVyVH8800EP6cHeucZQt0Q3JFagGKrI2hZ4T/p+Owa1N91Z2lpCkr l/kANm0t7TWB8T3r1Goq1eAgSBWEq8PxKYLsetNMaeHOV3iXzYDqn2HMrXbVlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706218609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zQz/YqqEzpTERjyc+1lzjX1LM19ZmTluaFIZJTxl/QI=; b=EXqsJfVxQoiKu7KUY+RmLPrge1UlqgJzmrIrgUoROTkfFOcCZ/cEtSoq5gKCEnyHzyrDow jCn9jmfDW/QVMJ1ij3NCiu00f1Ip1JWVS1X3TB5iGTP92OV8XrLaARmIGCnwmUmoZH7Xwj g4rapK/pK2wgu1hNfg1w1eWXC4U5HGmeBFjK5wovSjw0QTsE4QRbczkxgVBX4aekThyZW8 KU26L/hPJ4p9WUvzz3zp1bunrZjCl8oG2HReIzSfUuT4afByXkS+IF//fCoRsfQAvVHKAX B6dYIieu/xWPgkUTdMtx0BFRQ+WUgN+YAwKc351Ewn5tEfoWNqLAgJF6k9aYmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706218609; a=rsa-sha256; cv=none; b=BdtZ2lp/ImBjKGxrRL932zTA5pL6/85weg0k1HN8F9X63jRkK1afyfhRCibcexAwZoGSVz U/5+UQVSvfuwNAg/NifZl03zWizrS7+40SicFPDwUWfxv9SXgpaq0KUo/DxEvPF1cI/Km1 hEkn4Qf1d/ayBGb7N9+Bvti9TSzJ2mY8XsNdczbuP7zNxnK5pAj/9Z8TDqDwOEivVZeAfD ivN5CcqpbyI/hl6JAP3S2tCJUfsPht3gCAQw2bT70+PivNMMnvCl3BxAnzxO4dfpdJyoBD 1v+tuCrQHyO2UR69p61vKwFA9Ye/pSpiMKSF93DBTvjsJWP2sZXYcz85NmuxFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLZ0J6gckzF52; Thu, 25 Jan 2024 21:36:48 +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 40PLam1F015391; Thu, 25 Jan 2024 21:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PLamZh015388; Thu, 25 Jan 2024 21:36:48 GMT (envelope-from git) Date: Thu, 25 Jan 2024 21:36:48 GMT Message-Id: <202401252136.40PLamZh015388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 48d5dab7bace - main - arm64: Add a VM_FREELIST_DMA32 freelist List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48d5dab7bace6bae938672784ca3aa8733d72eb9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48d5dab7bace6bae938672784ca3aa8733d72eb9 commit 48d5dab7bace6bae938672784ca3aa8733d72eb9 Author: Mark Johnston AuthorDate: 2024-01-25 21:33:46 +0000 Commit: Mark Johnston CommitDate: 2024-01-25 21:33:46 +0000 arm64: Add a VM_FREELIST_DMA32 freelist When booting a KMSAN kernel on an Ampere Altra, I've seen some boot time hangs when the XHCI controller driver attempts to allocate memory for 32-bit DMA. The system boots fine with a GENERIC kernel; I believe that the additional memory requirements of KMSAN push it over the edge. The system has a bit less than 2GB of RAM below the 4GB boundary. Allocate a new freelist to segregate memory below 4GB, as we do on amd64, so that such memory allocation failures are less likely to occur. Reviewed by: alc MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D43503 --- sys/arm64/include/vmparam.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h index fe5d66c2d73f..d577b9315471 100644 --- a/sys/arm64/include/vmparam.h +++ b/sys/arm64/include/vmparam.h @@ -83,11 +83,13 @@ #define VM_FREEPOOL_DIRECT 1 /* - * Create one free page lists: VM_FREELIST_DEFAULT is for all physical - * pages. + * Create two free page lists: VM_FREELIST_DMA32 is for physical pages that have + * physical addresses below 4G, and VM_FREELIST_DEFAULT is for all other + * physical pages. */ -#define VM_NFREELIST 1 +#define VM_NFREELIST 2 #define VM_FREELIST_DEFAULT 0 +#define VM_FREELIST_DMA32 1 /* * When PAGE_SIZE is 4KB, an allocation size of 16MB is supported in order From nobody Thu Jan 25 22:00:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLZWj6BBzz587tK; Thu, 25 Jan 2024 22:00: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 4TLZWj5gcrz4bs1; Thu, 25 Jan 2024 22:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706220033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R+5Jt99xUKQ76wcMgZacmKxG5ccfWY6iWgoO3SeS+eI=; b=vtDnwVHL5kGEY/2+KQks6uxQbczUeeD96BjTeL513FrETIKw+IgjfqPbZlSxc10Ti2ty11 PwrJpVnGsl1Qx3UoT7Tzxw/SWsSZQQbr+rw/rSGei9elNp1j8QIRaIk9zXmtM7+DylQ5pS KOSObtkBKq2es5iJ8IciZA8a9CaFKGExg7qdmcyE/5qmeyYM+Wl/4/SSzbTmW4YomfxkEG adNfF7rQFZj54LPZf/nixJemL4h3YyxX5jZg+tQqV3P2qhsstLEQ080A7awq8Dj72U887b GFsSNT6bBQJE/F1xmbhjzjhV2T+Png+fWxo/h3pEwy+A3QgcqA0CRyP51f6Vlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706220033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R+5Jt99xUKQ76wcMgZacmKxG5ccfWY6iWgoO3SeS+eI=; b=roHkDOIP8QcZnx395UsvsP9OU8/XoUmxXIJOvulKTULfh0Hf46D8u9SrWlGWyLiUiYz4Dc 4akb88AJW4paK2MbNmvWsSN0vTGsY/VAqAZyCG88XRY/EleQrF531F1iIgOwMLhA1cJoPS IOKjPRUCHcXReGLmYxT3GX8pCde5z7u+9ZqxrPwkFeMEJ1S0i5FgtYtK95/cLpmGoUjm2B nLq5J8usF6/u9DasL0plwkdcc4JpJlntu5eyUrvELjdPcNx+cTAbD5E9GoG+/eZpceKL7q JyBlpyP2GJSZ/ECErD9+G1naaj/EFDHf168j2eBgTfO6l/rKGYe7d2qbcpFrKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706220033; a=rsa-sha256; cv=none; b=u3jcY/B3XHP2WSpihTRELp0Va9f3XrBnxDF/vIHrEKH96q/ryllGrS7vrw377QuRUHzRUS 8/KohwBQC3/FrmQiiX2j62TT80Cj4jDhvE3uKngiPAuQZZVw5y2B8Dq9MA+8gT7CkvoakQ RjnCxDwgm/jAMV0iOQajTSwtwUxUKokgUhRDblBCdU1A38n11L29bEema38BCW5AD/rb0J r7x2nhaIR/lNOK/zb1kCNZw9ZZVxsCrx5VMZPixwVhARTc33/QKXEZeVl7hwkKXxyVxFqd sDZi4HmCyzxzrPTE2JDYsFbuueL9SDCKie0Hn30L8r90qdLeXAZ19IgvtF2S5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLZWj4n2MzF5s; Thu, 25 Jan 2024 22:00: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 40PM0XT6059091; Thu, 25 Jan 2024 22:00:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PM0XPt059088; Thu, 25 Jan 2024 22:00:33 GMT (envelope-from git) Date: Thu, 25 Jan 2024 22:00:33 GMT Message-Id: <202401252200.40PM0XPt059088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 0932fb565a08 - main - tcp: fix TCPSTAT accounting for SACK List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0932fb565a08e6e13dd9843e7a60dae311911d0d Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=0932fb565a08e6e13dd9843e7a60dae311911d0d commit 0932fb565a08e6e13dd9843e7a60dae311911d0d Author: Richard Scheffenegger AuthorDate: 2024-01-25 21:03:36 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-25 21:58:33 +0000 tcp: fix TCPSTAT accounting for SACK Account for SACK retransmitted bytes once the actual length is known. This prevents a call to tcp_maxseg() and prepares for TSO support when transmitting from the SACK scoreboard. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43447 --- sys/netinet/tcp_output.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 71a50d54d5ee..58f63b593b2a 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -330,9 +330,6 @@ again: __func__, off)); sack_rxmit = 1; sendalot = 1; - TCPSTAT_INC(tcps_sack_rexmits); - TCPSTAT_ADD(tcps_sack_rexmit_bytes, - min(len, tcp_maxseg(tp))); } } after_sack_rexmit: @@ -1036,6 +1033,10 @@ send: tp->t_sndrexmitpack++; TCPSTAT_INC(tcps_sndrexmitpack); TCPSTAT_ADD(tcps_sndrexmitbyte, len); + if (sack_rxmit) { + TCPSTAT_INC(tcps_sack_rexmits); + TCPSTAT_ADD(tcps_sack_rexmit_bytes, len); + } #ifdef STATS stats_voi_update_abs_u32(tp->t_stats, VOI_TCP_RETXPB, len); From nobody Thu Jan 25 23:17:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLcF15r8tz58FvD; Thu, 25 Jan 2024 23:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TLcF13Kgsz4mpP; Thu, 25 Jan 2024 23:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706224677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3tuyvHAmHt0R+j7w4eAVelTnoXPsGiuHIBmCPqJCP8k=; b=Amb6maBudWUSvUawk55DDus7EsGKeMIGnDSultRP3s9ce5KrLOZMUSHyNgxfXjgzd4KrDC p3cpbcchOr6WYm1nX/aiBLrSklQaGvHCPaktVQpd2UYlLiXPp3qbh7xHq57041qS909BmO EkIpDTiYHSlx6nOY+i57riaZ3kZ9gBjv4IpMzwz2oudTD+bfQx/mVU7RlnL2NKqMFR5G4e hY0TBr1VOP3J85h7TfQUMRJtF1tO7Ay+uYeZnHR0nG+v9ncKRnrl7BdlXUrD91BsTgPGfK iYXSy6sJa0m1NYz+0preq4JUsA86G3gvAaA7aHuBiGyPqxOjrbCgXPviMZmQzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706224677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3tuyvHAmHt0R+j7w4eAVelTnoXPsGiuHIBmCPqJCP8k=; b=IMwq4w0OosSA926x4B0xnRGPgmeIwJ+gNTTkpUT8Sj1YGgrWFQFK7DasA6Dp7NfvgXfP2C J6s0fsBhtzlwqLHnx728EFLZ4JaTlVYooOoavwyHGyEGWdu+5aO3EFwfeHcNE9ti8kdRfS HrnMCw856KX3TMSGORXNYgFNbJhLZ/93Fz/tvY37QFcR/r/Sc/Cum/N7ain3RmzVpR91aW L8HrBKv1K+0vi1uRXAx0sygJJpayn7nhitCUrDF/mcj8Wy/rrujlE4LmeytYiy7i/H+KDh T7BP4cUVVqXAjRK6rix7RWuqE1GI7cFD+2VCacz+6sDfOF+pK2x+K+jDIJycxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706224677; a=rsa-sha256; cv=none; b=j66uYj377l3+UszrXiH5jT/XUWmGltpNLfMkSB+4zjBtf1RspTWYLSzFm3HmHdodHcQdc6 ZD+8JX/QZeVWNdKFZn+ynwhO4HxWcCdvVxi8NMI07M7PWATF4bnPdopBiH0E7LXM9qMasw ze/ZTX+x/pMSWXwChjs7WpxhwCzfRmaHQR95/iPbDHhgIur7n9q5ew0XZDD1xoVXZrbIgD 4xgGup4ZMd7F59dZy2TZHJvWBXepftyiNyW7klXa1cchv/RkLmNKH2hQ2GK7lvKCal2Iyt MSbtxUnWJd/M11lrMLfxXR4pSvVJR5FVm2A78mnB1eEHxvajzaCeHlSmvdIJFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLcF12Nq3zHqb; Thu, 25 Jan 2024 23:17: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 40PNHvrX084367; Thu, 25 Jan 2024 23:17:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PNHvp3084364; Thu, 25 Jan 2024 23:17:57 GMT (envelope-from git) Date: Thu, 25 Jan 2024 23:17:57 GMT Message-Id: <202401252317.40PNHvp3084364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: fc262fd3dc0a - main - tcp: AccECN access ACE field by shifting bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc262fd3dc0a111f42d34cff4012912db906549a Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=fc262fd3dc0a111f42d34cff4012912db906549a commit fc262fd3dc0a111f42d34cff4012912db906549a Author: Richard Scheffenegger AuthorDate: 2024-01-25 22:21:07 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-25 23:16:22 +0000 tcp: AccECN access ACE field by shifting bits Shifting bits is quicker than checking header flag bits one by one. Also improve readability by the use of switch statements. No change in behaviour. Reviewed By: glebius, tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43560 --- sys/netinet/tcp_ecn.c | 71 ++++++++++++++++++++++++--------------------------- sys/netinet/tcp_ecn.h | 3 ++- 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/sys/netinet/tcp_ecn.c b/sys/netinet/tcp_ecn.c index 43c23f8118f4..34ecfe1c83c0 100644 --- a/sys/netinet/tcp_ecn.c +++ b/sys/netinet/tcp_ecn.c @@ -96,6 +96,9 @@ #include #include +static inline int tcp_ecn_get_ace(uint16_t); +static inline void tcp_ecn_set_ace(uint16_t *, uint32_t); + static SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "TCP ECN"); @@ -116,22 +119,24 @@ SYSCTL_INT(_net_inet_tcp_ecn, OID_AUTO, maxretries, void tcp_ecn_input_syn_sent(struct tcpcb *tp, uint16_t thflags, int iptos) { - - if (V_tcp_do_ecn == 0) + switch (V_tcp_do_ecn) { + case 0: return; - if ((V_tcp_do_ecn == 1) || - (V_tcp_do_ecn == 2)) { + case 1: + /* FALLTHROUGH */ + case 2: /* RFC3168 ECN handling */ if ((thflags & (TH_CWR | TH_ECE)) == (0 | TH_ECE)) { tp->t_flags2 |= TF2_ECN_PERMIT; tp->t_flags2 &= ~TF2_ACE_PERMIT; TCPSTAT_INC(tcps_ecn_shs); } - } else - /* decoding Accurate ECN according to table in section 3.1.1 */ - if ((V_tcp_do_ecn == 3) || - (V_tcp_do_ecn == 4)) { - /* + break; + case 3: + /* FALLTHROUGH */ + case 4: + /* decoding Accurate ECN according to + * table in section 3.1.1 * on the SYN,ACK, process the AccECN * flags indicating the state the SYN * was delivered. @@ -208,6 +213,7 @@ tcp_ecn_input_syn_sent(struct tcpcb *tp, uint16_t thflags, int iptos) tp->t_rcep = 0b110; break; } + break; } } @@ -219,10 +225,12 @@ tcp_ecn_input_parallel_syn(struct tcpcb *tp, uint16_t thflags, int iptos) { if (thflags & TH_ACK) return; - if (V_tcp_do_ecn == 0) + switch (V_tcp_do_ecn) { + case 0: return; - if ((V_tcp_do_ecn == 1) || - (V_tcp_do_ecn == 2)) { + case 1: + /* FALLTHROUGH */ + case 2: /* RFC3168 ECN handling */ if ((thflags & (TH_CWR | TH_ECE)) == (TH_CWR | TH_ECE)) { tp->t_flags2 |= TF2_ECN_PERMIT; @@ -230,9 +238,10 @@ tcp_ecn_input_parallel_syn(struct tcpcb *tp, uint16_t thflags, int iptos) tp->t_flags2 |= TF2_ECN_SND_ECE; TCPSTAT_INC(tcps_ecn_shs); } - } else - if ((V_tcp_do_ecn == 3) || - (V_tcp_do_ecn == 4)) { + break; + case 3: + /* FALLTHROUGH */ + case 4: /* AccECN handling */ switch (thflags & (TH_AE | TH_CWR | TH_ECE)) { default: @@ -272,6 +281,7 @@ tcp_ecn_input_parallel_syn(struct tcpcb *tp, uint16_t thflags, int iptos) } break; } + break; } } @@ -418,13 +428,7 @@ tcp_ecn_output_established(struct tcpcb *tp, uint16_t *thflags, int len, bool rx * Reply with proper ECN notifications. */ if (tp->t_flags2 & TF2_ACE_PERMIT) { - *thflags &= ~(TH_AE|TH_CWR|TH_ECE); - if (tp->t_rcep & 0x01) - *thflags |= TH_ECE; - if (tp->t_rcep & 0x02) - *thflags |= TH_CWR; - if (tp->t_rcep & 0x04) - *thflags |= TH_AE; + tcp_ecn_set_ace(thflags, tp->t_rcep); if (!(tp->t_flags2 & TF2_ECN_PERMIT)) { /* * here we process the final @@ -476,9 +480,6 @@ tcp_ecn_syncache_socket(struct tcpcb *tp, struct syncache *sc) tp->t_scep = 6; tp->t_rcep = 6; break; - /* undefined SCF codepoint */ - default: - break; } } } @@ -591,24 +592,20 @@ tcp_ecn_syncache_respond(uint16_t thflags, struct syncache *sc) TCPSTAT_INC(tcps_ecn_shs); TCPSTAT_INC(tcps_ace_ce); break; - /* undefined SCF codepoint */ - default: - break; } } return thflags; } -int +static inline int tcp_ecn_get_ace(uint16_t thflags) { - int ace = 0; + return ((thflags & (TH_AE|TH_CWR|TH_ECE)) >> TH_ACE_SHIFT); +} - if (thflags & TH_ECE) - ace += 1; - if (thflags & TH_CWR) - ace += 2; - if (thflags & TH_AE) - ace += 4; - return ace; +static inline void +tcp_ecn_set_ace(uint16_t *thflags, uint32_t t_rcep) +{ + *thflags &= ~(TH_AE|TH_CWR|TH_ECE); + *thflags |= ((t_rcep << TH_ACE_SHIFT) & (TH_AE|TH_CWR|TH_ECE)); } diff --git a/sys/netinet/tcp_ecn.h b/sys/netinet/tcp_ecn.h index db5c71d64cab..89ee157361ab 100644 --- a/sys/netinet/tcp_ecn.h +++ b/sys/netinet/tcp_ecn.h @@ -38,6 +38,8 @@ #include #include +#define TH_ACE_SHIFT 6 + void tcp_ecn_input_syn_sent(struct tcpcb *, uint16_t, int); void tcp_ecn_input_parallel_syn(struct tcpcb *, uint16_t, int); int tcp_ecn_input_segment(struct tcpcb *, uint16_t, int, int, int); @@ -46,7 +48,6 @@ int tcp_ecn_output_established(struct tcpcb *, uint16_t *, int, bool); void tcp_ecn_syncache_socket(struct tcpcb *, struct syncache *); int tcp_ecn_syncache_add(uint16_t, int); uint16_t tcp_ecn_syncache_respond(uint16_t, struct syncache *); -int tcp_ecn_get_ace(uint16_t); #endif /* _KERNEL */ From nobody Fri Jan 26 00:19:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLdbj3sv9z58LYG; Fri, 26 Jan 2024 00:19: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 4TLdbj3QNBz4tv3; Fri, 26 Jan 2024 00:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706228353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XyLcVdeoh3kBss6wKG8alP4Wxp4dgC4OM+auUovu54=; b=t6lyALnX6HJm1b0PkzYcl1CwuDKhpCEln+4w5tMMUacZRC55dz1hFxODeblkjjH3rmaK6A H/92vMr5yeE/gCMPx2YQJ0fugWWTxQeLk4Y/nB2J8gj37c06LOUA7vbeyXlRzv1+9FRHgi 3LULdDTq6/OdQ7hNbv2qAzPJIbHBsmank2e5xRFvU/EdW7BVDl4uUq3oX2FmFcPyYr6O/f jOgIV9UCtRMfUkPv+CuQahBG1sDz+qriD8QgqdJfBs9KY6Aj+NI+JG0L5WRQCFMr5kotR6 ygnIcHZnuYiUgV+e3zuvsbSc0lPIJwnTQEXuw/LKczZKARufOB1cy7jLcLaA6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706228353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XyLcVdeoh3kBss6wKG8alP4Wxp4dgC4OM+auUovu54=; b=QVXbgaByQZOUpiNulraRi7J5oxOc3LUdfmSAbMCay1x6xBLCfjQxZV7VvzTKJXcOhYc3+3 /SETh/MqVt0+aHbdSly653kHIE5tjnKlE7hTMOKzyvLpnxgUQ4bfHxrz+t/gzbHePQTACK bMyPZLj8olxV4Q80b46CWpmVf5zbjkX/j5jspg/6+URnsL8T2MfEV9XadWuteczHqx5ZPx DICWW2SDZbTNotOvIMEAUnmUmm85LCCHBb3xLrRFmbyjNQIK3mbGHB8j9iOHRVNbfKPy02 vAQQuhJ2IDIkCe9X6SnzCxpXhoEUcokFmz/yG3ajyDRvg58nLt9lWEZS+0jBww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706228353; a=rsa-sha256; cv=none; b=wKtoUForh43DFLIjKcJ8SwV5NCNfTd6mvYh30I8kw5Xcxf8+N5eNKlDyJY+6WOhUFHhrf+ Z4jk06VqoNnZS95uHNQH7XNp0uWBpfhe++8YQnffj9i8BdckL/IlLx9sOHFIcv91U5c0NM 8YRvcoF4E2EboAqQEeOAMRVG+53U8t23P32KxsYEUuGxm7F+XGs4dMOE6xy602OITKfwlu gwZWutNkWlOwlKe4J5hQo6WdNM+OFsncgrzbwVOfzwp8eXQ1qLZ72FhiEoezAyVB1NfiVT MgcBo67bMBn2L7AexEitQw9j8Dz2Z7aOWRwcMjYC364RBsDqK66UOXsmk9ku9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLdbj2SyWzJx2; Fri, 26 Jan 2024 00:19: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 40Q0JDmW084174; Fri, 26 Jan 2024 00:19:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40Q0JD04084171; Fri, 26 Jan 2024 00:19:13 GMT (envelope-from git) Date: Fri, 26 Jan 2024 00:19:13 GMT Message-Id: <202401260019.40Q0JD04084171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3896a6cc0a8e - main - ldscript.powerpc*: Only put .dynamic in PT_DYNAMIC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3896a6cc0a8e774f33e6381ecc73be6e51dc6a53 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3896a6cc0a8e774f33e6381ecc73be6e51dc6a53 commit 3896a6cc0a8e774f33e6381ecc73be6e51dc6a53 Author: Jessica Clarke AuthorDate: 2024-01-26 00:19:02 +0000 Commit: Jessica Clarke CommitDate: 2024-01-26 00:19:02 +0000 ldscript.powerpc*: Only put .dynamic in PT_DYNAMIC Currently there are a few output sections left as implicitly using :kernel :dynamic before :kernel on its own is used again, which means they end up in both the PT_LOAD and the PT_DYNAMIC segments, an unusual situation which the new libelf-based kldxref initially treated as invalid. Thus, hoist the :kernel to the very next section to ensure only .dynamic is in PT_DYNAMIC, as is more normal. Whilst here, sync ldscript.powerpc64le with ldscript.powerpc64 to pick up various fixes that were presumably made between the start of the powerpc64le port and it being committed and got missed. Reviewed by: jhibbits, jhb Differential Revision: https://reviews.freebsd.org/D43066 --- sys/conf/ldscript.powerpc | 4 ++-- sys/conf/ldscript.powerpc64 | 4 ++-- sys/conf/ldscript.powerpc64le | 17 +++++++++-------- sys/conf/ldscript.powerpcspe | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/conf/ldscript.powerpc b/sys/conf/ldscript.powerpc index 2bfc02768a22..c08123e4eaba 100644 --- a/sys/conf/ldscript.powerpc +++ b/sys/conf/ldscript.powerpc @@ -86,7 +86,7 @@ SECTIONS get relocated with -mrelocatable. Also put in the .fixup pointers. The current compiler no longer needs this, but keep it around for 2.7.2 */ PROVIDE (_GOT2_START_ = .); - .got2 : { *(.got2) } + .got2 : { *(.got2) } :kernel PROVIDE (__CTOR_LIST__ = .); .ctors : { *(.ctors) } PROVIDE (__CTOR_END__ = .); @@ -100,7 +100,7 @@ SECTIONS /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } :kernel + .sdata : { *(.sdata) } _edata = .; PROVIDE (edata = .); .sbss : diff --git a/sys/conf/ldscript.powerpc64 b/sys/conf/ldscript.powerpc64 index f436a3bc0f64..df279576193f 100644 --- a/sys/conf/ldscript.powerpc64 +++ b/sys/conf/ldscript.powerpc64 @@ -111,7 +111,7 @@ SECTIONS get relocated with -mrelocatable. Also put in the .fixup pointers. The current compiler no longer needs this, but keep it around for 2.7.2 */ PROVIDE (_GOT2_START_ = .); - .got2 : { *(.got2) } + .got2 : { *(.got2) } :kernel PROVIDE (__CTOR_LIST__ = .); .ctors : { *(.ctors) } PROVIDE (__CTOR_END__ = .); @@ -125,7 +125,7 @@ SECTIONS /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } :kernel + .sdata : { *(.sdata) } _edata = .; PROVIDE (edata = .); .sbss : diff --git a/sys/conf/ldscript.powerpc64le b/sys/conf/ldscript.powerpc64le index bd883853711a..3fd80d3130fb 100644 --- a/sys/conf/ldscript.powerpc64le +++ b/sys/conf/ldscript.powerpc64le @@ -7,15 +7,15 @@ SEARCH_DIR(/usr/lib); PROVIDE (__stack = 0); PHDRS { - text PT_LOAD ; - dynamic PT_DYNAMIC ; + kernel PT_LOAD; + dynamic PT_DYNAMIC; } SECTIONS { /* Low-address wrapper for bootloaders (kexec/kboot) that can't parse ELF */ . = kernbase - 0x100; - .kboot : { *(.text.kboot) } :text + .kboot : { *(.text.kboot) } :kernel /* Read-only sections, merged into text segment: */ . = kernbase; @@ -36,9 +36,6 @@ SECTIONS /* Do not emit PT_INTERP section, which confuses some loaders (kexec-lite) */ /DISCARD/ : { *(.interp) } - /* Also delete notes */ - /DISCARD/ : { *(.note.*) } - .hash : { *(.hash) } .dynsym : { *(.dynsym) } .dynstr : { *(.dynstr) } @@ -50,6 +47,10 @@ SECTIONS *(.note.gnu.build-id) PROVIDE (__build_id_end = .); } + + /* Do not emit any additional notes. */ + /DISCARD/ : { *(.note.*) } + .rela.text : { *(.rela.text) *(.rela.gnu.linkonce.t*) } .rela.data : @@ -105,12 +106,12 @@ SECTIONS .got : ALIGN(8) { __tocbase = .; *(.got) } .toc : ALIGN(8) { *(.toc) } - .dynamic : { *(.dynamic) } :text :dynamic + .dynamic : { *(.dynamic) } :kernel :dynamic /* Put .ctors and .dtors next to the .got2 section, so that the pointers get relocated with -mrelocatable. Also put in the .fixup pointers. The current compiler no longer needs this, but keep it around for 2.7.2 */ PROVIDE (_GOT2_START_ = .); - .got2 : { *(.got2) } + .got2 : { *(.got2) } :kernel PROVIDE (__CTOR_LIST__ = .); .ctors : { *(.ctors) } PROVIDE (__CTOR_END__ = .); diff --git a/sys/conf/ldscript.powerpcspe b/sys/conf/ldscript.powerpcspe index 38209f6516c8..7d5b54a655a6 100644 --- a/sys/conf/ldscript.powerpcspe +++ b/sys/conf/ldscript.powerpcspe @@ -87,7 +87,7 @@ SECTIONS get relocated with -mrelocatable. Also put in the .fixup pointers. The current compiler no longer needs this, but keep it around for 2.7.2 */ PROVIDE (_GOT2_START_ = .); - .got2 : { *(.got2) } + .got2 : { *(.got2) } :kernel PROVIDE (__CTOR_LIST__ = .); .ctors : { *(.ctors) } PROVIDE (__CTOR_END__ = .); @@ -101,7 +101,7 @@ SECTIONS /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } :kernel + .sdata : { *(.sdata) } _edata = .; PROVIDE (edata = .); .sbss : From nobody Fri Jan 26 00:22:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLdg01C30z58Lj6; Fri, 26 Jan 2024 00:22: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 4TLdfz6j4yz4vlS; Fri, 26 Jan 2024 00: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=1706228523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wUBKztSI/GK3KKDCQGRaY4D4I7t7P+qqE24mG5rjiBU=; b=YkV4NR26DYoNJzMnK5xDgA69t0VcTLpPA/GFyWqFRNely3uYcsmQAzxGENaBseNSnTQDAV oEx24Tf5RB+60F32KKa8m8SGvROS50nqt6Oi6Nnmku+PtEHBfmKo3u1DNPp+iHqwx6c0Er 1eWXR+kf75zCj+P4ulKtaOJKBg3CX4DHFmvFX5cRRbMnw1jK2PTxxpRDNtX7gy0GnswVK3 /CT/+YrfYRX94cwDOQHL5+85WWtwuTMepUBxMHG7/1oHwr65F58hsiWsfD6Q6OgnVIDPGC /djBbxi0FrmuxTieXww+yQ5g7ENMjYwthLhBPcK56C//DJ/DutF/zvllZKr+/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706228523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wUBKztSI/GK3KKDCQGRaY4D4I7t7P+qqE24mG5rjiBU=; b=FO3P+3Jq5uDrBLWQb8sz0yJ1Lxk3xwvI5gPD28oxqf3x2m2ZkyWmSoqZwDJfK6QPK25SC6 67E/LkhpMhqXffZ16K07J/1cujlnfjCheZJi3T5uBOss5xtqzdGQNXuYotQUco0j5l9ddS JZbZuvvN8tk7SjPSn0U4PYwUazTTARmuWXTN7WDqo4uy9p9csXdI0JcnpySofHc+Vn+rKL DPrsOv02n3/aUJ/sdfOYRHoFnhR0zbm/KHT28dNGntxJULW14fkDQrrdAU5Bx5ib6k72Gg 6by51BXHmq+i6vmbR2cIY67wTKtRn5i1jOY8c6nkiE4RiaHV8MGmB4aR3i0hDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706228523; a=rsa-sha256; cv=none; b=bQP7cG6kVVuBBIQZ7ZIwN17zmEr2V8dBVrUnfJ5bgn10qHgd+lEXODc7Bnb6fNbu6qGSoO 2idcFqhGCXQv0ARtQgktIXX699wZLzEpMcciqyslxPeD8Ree8PR0Fk2ZY3NMM/z6A9uxhE dR9rmpEOZGt/m4Lfl1jHoNkc99JBZNtIJtLn3KAQuw5klkrBkHd+hhUW2acmvseP9BGB2F H77XWI3eDnHSbIymtWqkUcRnL7MvZCNWk/VQTgCRNMX9ktajgf7n7p4Y2buIl1J9mHqZTD h8nJ9TA2j2H6HAiPq/gNeyBzb94Lsf2eWcX54U8vnos8LCMmXHfv1SpVdnqwjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLdfz5pH5zJrh; Fri, 26 Jan 2024 00: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 40Q0M3Fa096420; Fri, 26 Jan 2024 00: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 40Q0M3DK096417; Fri, 26 Jan 2024 00:22:03 GMT (envelope-from git) Date: Fri, 26 Jan 2024 00:22:03 GMT Message-Id: <202401260022.40Q0M3DK096417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 2d05a1c81b2c - main - tcp: commonize check for more data to send, style changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d05a1c81b2cbb5468a242d0add44f850aa31811 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=2d05a1c81b2cbb5468a242d0add44f850aa31811 commit 2d05a1c81b2cbb5468a242d0add44f850aa31811 Author: Richard Scheffenegger AuthorDate: 2024-01-25 23:19:30 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-26 00:20:35 +0000 tcp: commonize check for more data to send, style changes Use SEQ_SUB instead of a plain subtraction, for an implict type conversion and prevention of a possible overflow. Use curly brackets in stacked if statements throughout. Use of the ? operator to enhance readability when clearing the FIN flag in tcp_output(). None of the above change the function. Reviewed By: tuexen, cc, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43539 --- sys/netinet/tcp_ecn.c | 9 ++--- sys/netinet/tcp_input.c | 94 ++++++++++++++++++++++++++++-------------------- sys/netinet/tcp_output.c | 12 +++---- sys/netinet/tcp_sack.c | 31 +++++++++------- 4 files changed, 83 insertions(+), 63 deletions(-) diff --git a/sys/netinet/tcp_ecn.c b/sys/netinet/tcp_ecn.c index 34ecfe1c83c0..5332b3caf950 100644 --- a/sys/netinet/tcp_ecn.c +++ b/sys/netinet/tcp_ecn.c @@ -135,9 +135,11 @@ tcp_ecn_input_syn_sent(struct tcpcb *tp, uint16_t thflags, int iptos) case 3: /* FALLTHROUGH */ case 4: - /* decoding Accurate ECN according to + /* + * Decoding Accurate ECN according to * table in section 3.1.1 - * on the SYN,ACK, process the AccECN + * + * On the SYN,ACK, process the AccECN * flags indicating the state the SYN * was delivered. * Reactions to Path ECN mangling can @@ -382,8 +384,7 @@ tcp_ecn_output_syn_sent(struct tcpcb *tp) thflags = TH_ECE|TH_CWR; } else thflags = TH_ECE|TH_CWR; - } else - if (V_tcp_do_ecn == 3) { + } else if (V_tcp_do_ecn == 3) { /* Send an Accurate ECN setup packet */ if (tp->t_rxtshift >= 1) { if (tp->t_rxtshift <= V_tcp_ecn_maxretries) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 02b042fd3273..98564ff67f22 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1624,13 +1624,14 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, */ if ((to.to_flags & TOF_TS) && (to.to_tsecr != 0)) { to.to_tsecr -= tp->ts_offset; - if (TSTMP_GT(to.to_tsecr, tcp_ts_getticks())) + if (TSTMP_GT(to.to_tsecr, tcp_ts_getticks())) { to.to_tsecr = 0; - else if (tp->t_rxtshift == 1 && + } else if (tp->t_rxtshift == 1 && tp->t_flags & TF_PREVVALID && tp->t_badrxtwin != 0 && - TSTMP_LT(to.to_tsecr, tp->t_badrxtwin)) + TSTMP_LT(to.to_tsecr, tp->t_badrxtwin)) { cc_cong_signal(tp, th, CC_RTO_ERR); + } } /* * Process options only when we get SYN/ACK back. The SYN case @@ -1647,8 +1648,9 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, !(tp->t_flags & TF_NOOPT)) { tp->t_flags |= TF_RCVD_SCALE; tp->snd_scale = to.to_wscale; - } else + } else { tp->t_flags &= ~TF_REQ_SCALE; + } /* * Initial send window. It will be updated with * the next incoming segment to the scaled value. @@ -1660,30 +1662,36 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, tp->t_flags |= TF_RCVD_TSTMP; tp->ts_recent = to.to_tsval; tp->ts_recent_age = tcp_ts_getticks(); - } else + } else { tp->t_flags &= ~TF_REQ_TSTMP; - if (to.to_flags & TOF_MSS) + } + if (to.to_flags & TOF_MSS) { tcp_mss(tp, to.to_mss); + } if ((tp->t_flags & TF_SACK_PERMIT) && (!(to.to_flags & TOF_SACKPERM) || - (tp->t_flags & TF_NOOPT))) + (tp->t_flags & TF_NOOPT))) { tp->t_flags &= ~TF_SACK_PERMIT; + } if (IS_FASTOPEN(tp->t_flags)) { if ((to.to_flags & TOF_FASTOPEN) && !(tp->t_flags & TF_NOOPT)) { uint16_t mss; - if (to.to_flags & TOF_MSS) + if (to.to_flags & TOF_MSS) { mss = to.to_mss; - else - if ((inp->inp_vflag & INP_IPV6) != 0) + } else { + if ((inp->inp_vflag & INP_IPV6) != 0) { mss = TCP6_MSS; - else + } else { mss = TCP_MSS; + } + } tcp_fastopen_update_cache(tp, mss, to.to_tfo_len, to.to_tfo_cookie); - } else + } else { tcp_fastopen_disable_path(tp); + } } } @@ -1872,9 +1880,11 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, * is new data available to be sent * or we need to send an ACK. */ - if (SEQ_GT(tp->snd_una + sbavail(&so->so_snd), - tp->snd_max) || tp->t_flags & TF_ACKNOW) + if ((tp->t_flags & TF_ACKNOW) || + (sbavail(&so->so_snd) >= + SEQ_SUB(tp->snd_max, tp->snd_una))) { (void) tcp_output(tp); + } goto check_delack; } } else if (th->th_ack == tp->snd_una && @@ -2585,12 +2595,12 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, */ if (th->th_ack != tp->snd_una || (tcp_is_sack_recovery(tp, &to) && - (sack_changed == SACK_NOCHANGE))) + (sack_changed == SACK_NOCHANGE))) { break; - else if (!tcp_timer_active(tp, TT_REXMT)) + } else if (!tcp_timer_active(tp, TT_REXMT)) { tp->t_dupacks = 0; - else if (++tp->t_dupacks > tcprexmtthresh || - IN_FASTRECOVERY(tp->t_flags)) { + } else if (++tp->t_dupacks > tcprexmtthresh || + IN_FASTRECOVERY(tp->t_flags)) { cc_ack_received(tp, th, nsegs, CC_DUPACK); if (V_tcp_do_prr && @@ -2599,7 +2609,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, tcp_do_prr_ack(tp, th, &to, sack_changed, &maxseg); } else if (tcp_is_sack_recovery(tp, &to) && - IN_FASTRECOVERY(tp->t_flags)) { + IN_FASTRECOVERY(tp->t_flags)) { int awnd; /* @@ -2608,19 +2618,20 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, * we have less than 1/2 the original window's * worth of data in flight. */ - if (V_tcp_do_newsack) + if (V_tcp_do_newsack) { awnd = tcp_compute_pipe(tp); - else + } else { awnd = (tp->snd_nxt - tp->snd_fack) + tp->sackhint.sack_bytes_rexmit; - + } if (awnd < tp->snd_ssthresh) { tp->snd_cwnd += maxseg; if (tp->snd_cwnd > tp->snd_ssthresh) tp->snd_cwnd = tp->snd_ssthresh; } - } else + } else { tp->snd_cwnd += maxseg; + } (void) tcp_output(tp); goto drop; } else if (tp->t_dupacks == tcprexmtthresh || @@ -2688,13 +2699,13 @@ enter_recovery: tp->snd_nxt - tp->snd_una); } if (tcp_is_sack_recovery(tp, &to)) { - TCPSTAT_INC( - tcps_sack_recovery_episode); + TCPSTAT_INC(tcps_sack_recovery_episode); tp->snd_recover = tp->snd_nxt; tp->snd_cwnd = maxseg; (void) tcp_output(tp); - if (SEQ_GT(th->th_ack, tp->snd_una)) + if (SEQ_GT(th->th_ack, tp->snd_una)) { goto resume_partialack; + } goto drop; } tp->snd_nxt = th->th_ack; @@ -2720,8 +2731,7 @@ enter_recovery: * segment. Restore the original * snd_cwnd after packet transmission. */ - cc_ack_received(tp, th, nsegs, - CC_DUPACK); + cc_ack_received(tp, th, nsegs, CC_DUPACK); uint32_t oldcwnd = tp->snd_cwnd; tcp_seq oldsndmax = tp->snd_max; u_int sent; @@ -2743,12 +2753,14 @@ enter_recovery: * or we need to send an ACK. */ SOCKBUF_LOCK(&so->so_snd); - avail = sbavail(&so->so_snd) - - (tp->snd_nxt - tp->snd_una); + avail = sbavail(&so->so_snd); SOCKBUF_UNLOCK(&so->so_snd); - if (avail > 0 || tp->t_flags & TF_ACKNOW) + if (tp->t_flags & TF_ACKNOW || + (avail >= + SEQ_SUB(tp->snd_nxt, tp->snd_una))) { (void) tcp_output(tp); - sent = tp->snd_max - oldsndmax; + } + sent = SEQ_SUB(tp->snd_max, oldsndmax); if (sent > maxseg) { KASSERT((tp->t_dupacks == 2 && tp->snd_limited == 0) || @@ -2757,8 +2769,9 @@ enter_recovery: ("%s: sent too much", __func__)); tp->snd_limited = 2; - } else if (sent > 0) + } else if (sent > 0) { ++tp->snd_limited; + } tp->snd_cwnd = oldcwnd; goto drop; } @@ -3316,9 +3329,9 @@ dodata: /* XXX */ /* * Return any desired output. */ - if (needoutput || (tp->t_flags & TF_ACKNOW)) + if (needoutput || (tp->t_flags & TF_ACKNOW)) { (void) tcp_output(tp); - + } check_delack: INP_WLOCK_ASSERT(inp); @@ -3982,8 +3995,9 @@ tcp_do_prr_ack(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to, tp->sackhint.sack_bytes_rexmit; } else { if (tp->sackhint.prr_delivered < (tcprexmtthresh * maxseg + - tp->snd_recover - tp->snd_una)) + tp->snd_recover - tp->snd_una)) { del_data = maxseg; + } pipe = imax(0, tp->snd_max - tp->snd_una - imin(INT_MAX / 65536, tp->t_dupacks) * maxseg); } @@ -4009,13 +4023,14 @@ tcp_do_prr_ack(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to, * - Prevent ACK splitting attacks, by being conservative * when no new data is acked. */ - if ((sack_changed == SACK_NEWLOSS) || (del_data == 0)) + if ((sack_changed == SACK_NEWLOSS) || (del_data == 0)) { limit = tp->sackhint.prr_delivered - tp->sackhint.prr_out; - else + } else { limit = imax(tp->sackhint.prr_delivered - tp->sackhint.prr_out, del_data) + maxseg; + } snd_cnt = imin((tp->snd_ssthresh - pipe), limit); } snd_cnt = imax(snd_cnt, 0) / maxseg; @@ -4033,8 +4048,9 @@ tcp_do_prr_ack(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to, tp->snd_cwnd = (tp->snd_max - tp->snd_una) + (snd_cnt * maxseg); } - } else if (IN_CONGRECOVERY(tp->t_flags)) + } else if (IN_CONGRECOVERY(tp->t_flags)) { tp->snd_cwnd = pipe - del_data + (snd_cnt * maxseg); + } tp->snd_cwnd = imax(maxseg, tp->snd_cwnd); } diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 58f63b593b2a..50dc05e9c55a 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -392,10 +392,10 @@ after_sack_rexmit: * in which case len is already set. */ if (sack_rxmit == 0) { - if (sack_bytes_rxmt == 0) + if (sack_bytes_rxmt == 0) { len = ((int32_t)min(sbavail(&so->so_snd), sendwin) - off); - else { + } else { int32_t cwin; /* @@ -558,12 +558,8 @@ after_sack_rexmit: ipoptlen == 0 && !(flags & TH_SYN)) tso = 1; - if (sack_rxmit) { - if (SEQ_LT(p->rxmit + len, tp->snd_una + sbused(&so->so_snd))) - flags &= ~TH_FIN; - } else { - if (SEQ_LT(tp->snd_nxt + len, tp->snd_una + - sbused(&so->so_snd))) + if (SEQ_LT((sack_rxmit ? p->rxmit : tp->snd_nxt) + len, + tp->snd_una + sbused(&so->so_snd))) { flags &= ~TH_FIN; } diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index f517bb9fcdb7..0c557dc4579d 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -988,12 +988,13 @@ tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th, u_int *maxsegp) if (tp->t_flags & TF_SENTFIN) highdata--; highdata = SEQ_MIN(highdata, tp->snd_recover); - if (th->th_ack != highdata) { + if (SEQ_LT(th->th_ack, highdata)) { tp->snd_fack = th->th_ack; if ((temp = tcp_sackhole_insert(tp, SEQ_MAX(th->th_ack, - highdata - maxseg), highdata, NULL)) != NULL) - tp->sackhint.hole_bytes += temp->end - - temp->start; + highdata - maxseg), highdata, NULL)) != NULL) { + tp->sackhint.hole_bytes += + temp->end - temp->start; + } } } (void) tcp_output(tp); @@ -1065,27 +1066,33 @@ tcp_sack_adjust(struct tcpcb *tp) struct sackhole *p, *cur = TAILQ_FIRST(&tp->snd_holes); INP_WLOCK_ASSERT(tptoinpcb(tp)); - if (cur == NULL) - return; /* No holes */ - if (SEQ_GEQ(tp->snd_nxt, tp->snd_fack)) - return; /* We're already beyond any SACKed blocks */ + if (cur == NULL) { + /* No holes */ + return; + } + if (SEQ_GEQ(tp->snd_nxt, tp->snd_fack)) { + /* We're already beyond any SACKed blocks */ + return; + } /*- * Two cases for which we want to advance snd_nxt: * i) snd_nxt lies between end of one hole and beginning of another * ii) snd_nxt lies between end of last hole and snd_fack */ while ((p = TAILQ_NEXT(cur, scblink)) != NULL) { - if (SEQ_LT(tp->snd_nxt, cur->end)) + if (SEQ_LT(tp->snd_nxt, cur->end)) { return; - if (SEQ_GEQ(tp->snd_nxt, p->start)) + } + if (SEQ_GEQ(tp->snd_nxt, p->start)) { cur = p; - else { + } else { tp->snd_nxt = p->start; return; } } - if (SEQ_LT(tp->snd_nxt, cur->end)) + if (SEQ_LT(tp->snd_nxt, cur->end)) { return; + } tp->snd_nxt = tp->snd_fack; } From nobody Fri Jan 26 06:20:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TLncT01Cbz57gvW; Fri, 26 Jan 2024 06:20: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 4TLncS6g8zz4X7m; Fri, 26 Jan 2024 06: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=1706250024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YxTZkAMflVk3SsW56FMasLx8eukZZvTIfBfhzO/e4A0=; b=clsXe6R+wIqbIm3/4erNAi29QQNxR71s9/xxAw88Bb0X5A9xJ2FbN6eYHdEfTLbrCsiek7 cREzFvABgVWnCNN1x/cZv94wjVRnEBoAC82aTQJ0WBQet4OqxX/CZQouAdzrxXXHiwTvAx R9TUZVFReN3mKrScpx+w8Vw8PNBppZIEqqi5t0e3bXqS+vAPqVNLye2ZkkQO9zrg1SkfB2 r08m+yDtnHyCGy5tKmktkNaTx/odJ2t4c/iehHXlOP2kpjph8m78eGJL50XxIfS+BKtw/Z YwwEas3gKf3Gk4iLNno8wH47m4fyOZAnZn9o2Mlrlj1muy+y/AORlAp3H6o+KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706250024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YxTZkAMflVk3SsW56FMasLx8eukZZvTIfBfhzO/e4A0=; b=RJ80ecHxUek23kL1TdjPBp6trDLXwQRfsqw6HvYKRXShXFcRRjp6wmxtMNB1/Fk8sDp49A LmQkUKCL3vOi5LaNkal7F4rWti38YqhVUxVwfuZLApeOerJFFzmPhukzdm1U0ECK7I2W1S 8Ns6+TvdJzzrtYXliz5HgtmiPKs1heOH1FhLcLMvj0YAOTMmlyaaLiWFB7mTG/KlttxK7X +bgqUe5FVxZApbjQt4lUXkI5JIbhhuvPPNI//PBsF/nQ0UHOJ1Mpo5W0rnd5tJ5ZqUYA+j 9Bmg53ivE1aD2pVquxtTFUTxNJBZg8pIxTSWrOCv0pINEV1B1jocUI/qgClRBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706250024; a=rsa-sha256; cv=none; b=sSHnh1mESKI+Ha/PQRxneXGqsTL/8nbzXAfr4EjCb1Ev5HYFaR6WM3Ai9xtbt5Sl0hP1Lq NJy7jCNi8pH97+ukLl3D0vcLtdlM2/vOmVe4SkE06Q5MtHvN6ixdwC+k6w1eXnMsuN1uC8 97pA9xtid6f0mb5qLfO5fGzvvM1dfPSTP5z8wwangFgpaTdOokN2qQkFQg4lb4wFn6PuEJ inGLeXMy553w0/oBihkDm+04VfmgaEiRPxUDvB0Ahc0kpt5EXrmZdq/1rjiXerAW3hPbGl fMK36UFtcPN+l6U4VZiNay/77TPr+P7Vz5JmIDdunEPb94GgaeOSE8ruTIOYNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TLncS5jfDzWBs; Fri, 26 Jan 2024 06: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 40Q6KOFo095975; Fri, 26 Jan 2024 06: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 40Q6KOnp095972; Fri, 26 Jan 2024 06:20:24 GMT (envelope-from git) Date: Fri, 26 Jan 2024 06:20:24 GMT Message-Id: <202401260620.40Q6KOnp095972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b32d49cfbaa0 - main - tests: fix typo in a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b32d49cfbaa0437d08e65e7cd7c82c5951b1a852 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b32d49cfbaa0437d08e65e7cd7c82c5951b1a852 commit b32d49cfbaa0437d08e65e7cd7c82c5951b1a852 Author: Gleb Smirnoff AuthorDate: 2024-01-26 06:19:35 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-26 06:19:59 +0000 tests: fix typo in a comment --- tests/sys/kern/shutdown_dgram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/shutdown_dgram.c b/tests/sys/kern/shutdown_dgram.c index 04382d14f48f..c46c2091a5a0 100644 --- a/tests/sys/kern/shutdown_dgram.c +++ b/tests/sys/kern/shutdown_dgram.c @@ -39,7 +39,7 @@ * shutdown(2) on SOCK_DGRAM shall return ENOTCONN per POSIX. However, there * is historical behavior of the shutdown(2) also unblocking any ongoing * recv(2) syscall on the socket. It is known that some programs rely on this - * behavior, but exact list of problems isn't known. Neither we know if the + * behavior, but exact list of programs isn't known. Neither we know if the * "feature" is required on PF_UNIX sockets or on PF_INET/INET6 sockets or * on both kinds. Feel free to improve this comment if you know any details. * From nobody Fri Jan 26 15:38:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM20R2pv9z58Lwt; Fri, 26 Jan 2024 15:38: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 4TM20R275Hz4V4d; Fri, 26 Jan 2024 15:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706283511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbmRuPB4qhBtyEz+gGsomiEH79SIEtEVj2PeEGzrrU4=; b=FvtTsibZaPeykowJ6Nqw9efvuZFxLZLZZuLi6bL2aOwXl4/dVn2NNlebTh1PGWcUvB2qOf i+Gx/qkogSGdbzVr7viUhccYG2VcUVmJhoePnre7thPV1ZCK2shZefL8Fv8C2omn3sDYUo BAQfaASxRK2R3XCGOerP6YGihZV5O1b8rDm7pUsocS5VauPVY1Tlyi8mVO8sTvtjE45wEO 5vfqyuNqcOguvzJntaX738nJ7aHs/d6hxY3funHbY3GrxboP6ai+ORD7SHutANyUJXpoM4 AqEBjXp2hUqp+EFU+a0UvkvkWoYLYtONJHnLiHU4y+DWwzIw84N97uGFZtrMGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706283511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbmRuPB4qhBtyEz+gGsomiEH79SIEtEVj2PeEGzrrU4=; b=QzVzXnT2HPtauQVxZucu330cvxLZcCpIUShag+AUS+DLbIRFHCLLe2Tazu2xasGqBirtfx GrgtIPj3Q7OuFDp3dGXB6cPxRsFrrDD/DyPY7pcx2Sw4kSAy2kDLohDvJNP+mcU0ybuGEb VMRygenGnBTQruP8+wOaDMj3CjmTh8DHuh2FuHDBhOV2ExbZRhbsceCjVfbFZHywajHBb5 APHrp2BRaMFpujEmDJCdcF1QJdHnCXFvVKX+bfac461ySEyiVkyU6sDfVoOHETCpPR6xMB N4NiOOT2/YwwFJO0ZuyEikca5kUaLDqVVm7lJHbTm9Qlgso6JMYF5Pq5iFWgAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706283511; a=rsa-sha256; cv=none; b=bz9oYJsTvAIJQZL0g9umBTtTpKYPtT9SSZ3AJH78Iskee8aP9eDMrpELNIgxUe/Wd24iOt iqy+jrIhQtg09V2HRc16P39gKWUJSfKJ2OTCgDrJ/ieAkcNcXZxP+RmhsLN7Gez6jCXIgX jQ9HuU0XyhmHK6YepQlEubDTcA/3NBzwM/1Ra9kY67RbI0ZHNKX1bsbiMN759JN608Ytkw +sjZQhjTv8Cc+Ap4tHZ0jhc8GWFaZa8x1HzQgW89mvuMRm/Q/hJcIMXUhNGLSptxkAcY5P h6aPF+iGhwcEhdtCQWDR+dVTcynTNlBMhjIVIEk0OAYYSpB3/PwIhzjpJrZvQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM20R139Bzn7g; Fri, 26 Jan 2024 15:38: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 40QFcVLE027043; Fri, 26 Jan 2024 15:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QFcVBR027040; Fri, 26 Jan 2024 15:38:31 GMT (envelope-from git) Date: Fri, 26 Jan 2024 15:38:31 GMT Message-Id: <202401261538.40QFcVBR027040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ea6a6b63e1fd - main - open: make non-POSIX errno value more apparent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea6a6b63e1fd304e790c8ed7627caf5e3ba52bc7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ea6a6b63e1fd304e790c8ed7627caf5e3ba52bc7 commit ea6a6b63e1fd304e790c8ed7627caf5e3ba52bc7 Author: Ed Maste AuthorDate: 2024-01-26 15:19:04 +0000 Commit: Ed Maste CommitDate: 2024-01-26 15:36:32 +0000 open: make non-POSIX errno value more apparent In the errno list, add an explicit note and reference to the note in the STANDARDS section. When O_NOFOLLOW is specified and the target is a symbolic link FreeBSD sets errno to a value different than that specified by POSIX. Commit 295159dfa3ed added a note to this effect, but I missed it when reading through the list of errno values. PR: 214633 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43618 --- lib/libc/sys/open.2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2 index df9400e80036..a6859a6c4931 100644 --- a/lib/libc/sys/open.2 +++ b/lib/libc/sys/open.2 @@ -481,6 +481,10 @@ The system file table is full. .It Bq Er EMLINK .Dv O_NOFOLLOW was specified and the target is a symbolic link. +.Tn POSIX +specifies a different error for this case; see the note in +.Sx STANDARDS +below. .It Bq Er ENXIO The named file is a character special or block special file, and the device associated with this special file @@ -643,6 +647,7 @@ is set, and the process is in capability mode. .Sh STANDARDS These functions are specified by .St -p1003.1-2008 . +.Pp .Fx sets .Va errno From nobody Fri Jan 26 15:45:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM28c6cCFz58MW9; Fri, 26 Jan 2024 15:45: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 4TM28c5drnz4WTt; Fri, 26 Jan 2024 15:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706283936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7cv80T7BCn/3ckNonyavIel8kDNZkN/OiHZ2pLseGtk=; b=fBeU3xyZyUEPjK6Mm2IB+HKRdbjLvlt5FtPEa69QKnL8l44eGGeS6hH5cJLamgSeiBT/8+ 3XGMuWOemqOiHRk+0pBPqBE9tIX3EXLfQArljTdoLCAHr3GOPuKDiGc92qsifw1LmQ0Q7T 67d6tJemik2tOFj8pl0aVE91Xsfkev4L2dgsFm028a/OHECeTEW/M+xUFqhlH/3Kkdx4qP wiI1g6dsLxETm9AqNPKWxEYPmxL8yTrWbNvdlUcFPqPzi+7GRy7usK6sbp8VxvtHIQGD6Q pjEx/QTQfRuAiL54UajNGBlZ2uKHvZNdhNs3KlAJUMJQoEZAJqGHv05mKtu5LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706283936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7cv80T7BCn/3ckNonyavIel8kDNZkN/OiHZ2pLseGtk=; b=Rscyt0oP5+xrLbq92Smzjq9qzSthrhwvM4D/uMPcZfYEfgUJU8JJ56tftxVZGgMIJ/8OtQ gAM7nfGYy2nUMW4gzA+7CsU+pqZ1JlGX3GM6GOVbkwpM1YrxyPBkH+MVVjE7lCtQpLDxLH u3KlfS1r7BGvqhpp7cxO39mm3tCNJMr1qNrQ3IWhdnAtkBT49ZrGvOr5nhXXKpGAYap7zg CIBDe37sR4qYGhRk35ff/FH8Vm8Nc9M9xrLFyUSzyt31hbSYnM6hMBEHQTj3m/NnM6EM3w CiiOjzCTOcdseLKo8z049rmtk8m8u2S3+fl0CgZWJ/aI/PjsnTPoFLZuv3K0OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706283936; a=rsa-sha256; cv=none; b=mZdXldVKjAJcCQPerzrURcisB6qq7AVqI8NgZtDWH2hwO7fv2bylU/XHIUbKQzFH9GCqRL 4Z7c3m16hHIn+/Bkzw+kBarKFbXqjjxx51KgNnrCxl/sJcLNpkWM9y4B6r+iY6S1o8m++s qn6xG3zeqITuU+pt/1E463jb2e5+p6YFy02asT747VIeoqGAA7RjgcPmoZ8kwKUS0LF9VU Q/N/28QMb2ViX25pQqwApFVvl6TDrDQHLBv7+Dw6vkGIgaLMCUbPghg/VDJ38YTPx3NUay z25UFYvPdGJq5V9xuDKEGK6M6eMidJBRvhQmhQiWY9zTr4CmmfgcwpcblAsAyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM28c4hBKznZ6; Fri, 26 Jan 2024 15:45: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 40QFjalg043216; Fri, 26 Jan 2024 15:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QFjaMF043214; Fri, 26 Jan 2024 15:45:36 GMT (envelope-from git) Date: Fri, 26 Jan 2024 15:45:36 GMT Message-Id: <202401261545.40QFjaMF043214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 90372a9e3cda - main - arm64: Remove pmap_san_bootstrap() and call kasan_init_early() directly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90372a9e3cda838914bc8518dbc4340906351e98 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=90372a9e3cda838914bc8518dbc4340906351e98 commit 90372a9e3cda838914bc8518dbc4340906351e98 Author: Mark Johnston AuthorDate: 2024-01-26 15:35:40 +0000 Commit: Mark Johnston CommitDate: 2024-01-26 15:42:34 +0000 arm64: Remove pmap_san_bootstrap() and call kasan_init_early() directly pmap_san_bootstrap() doesn't really do much, and it was hard-coding the the bootstrap stack size defined in locore.S. Moreover, the name is a bit confusing given the existence of pmap_bootstrap_san(). Just remove it and call kasan_init_early() directly like we do on amd64. It will not be used by KMSAN in a forthcoming patch series. No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D43403 --- sys/amd64/include/pmap.h | 1 - sys/arm64/arm64/locore.S | 11 +++++++++-- sys/arm64/arm64/pmap.c | 6 ------ sys/arm64/include/pmap.h | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 17df8d0b8fde..cb95b311a3b9 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -495,7 +495,6 @@ void pmap_page_array_startup(long count); vm_page_t pmap_page_alloc_below_4g(bool zeroed); #if defined(KASAN) || defined(KMSAN) -void pmap_san_bootstrap(void); void pmap_san_enter(vm_offset_t); #endif diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 8b0564298296..b246ed3f2a41 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -45,6 +45,11 @@ #define L3_PAGE_COUNT 32 #endif +/* + * The size of our bootstrap stack. + */ +#define BOOT_STACK_SIZE (KSTACK_PAGES * PAGE_SIZE) + .globl kernbase .set kernbase, KERNBASE @@ -147,7 +152,9 @@ virtdone: mov x19, x0 /* Bootstrap an early shadow map for the boot stack. */ - bl pmap_san_bootstrap + ldr x0, [x0, #BP_KERN_STACK] + ldr x1, =BOOT_STACK_SIZE + bl kasan_init_early /* Restore bootparams */ mov x0, x19 @@ -880,7 +887,7 @@ END(abort) .bss .align PAGE_SHIFT initstack: - .space (PAGE_SIZE * KSTACK_PAGES) + .space BOOT_STACK_SIZE initstack_end: .section .init_pagetable, "aw", %nobits diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 134ad187130c..f44371080c91 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -7864,12 +7864,6 @@ pmap_pte_bti(pmap_t pmap, vm_offset_t va __diagused) #if defined(KASAN) static pd_entry_t *pmap_san_early_l2; -void __nosanitizeaddress -pmap_san_bootstrap(struct arm64_bootparams *abp) -{ - kasan_init_early(abp->kern_stack, KSTACK_PAGES * PAGE_SIZE); -} - #define SAN_BOOTSTRAP_L2_SIZE (1 * L2_SIZE) #define SAN_BOOTSTRAP_SIZE (2 * PAGE_SIZE) static vm_offset_t __nosanitizeaddress diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index efbf7eaaae91..4b4d47ccc7af 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -194,7 +194,6 @@ struct arm64_bootparams; void pmap_bootstrap_san(void); void pmap_san_enter(vm_offset_t); -void pmap_san_bootstrap(struct arm64_bootparams *); #endif #endif /* _KERNEL */ From nobody Fri Jan 26 17:48:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM4tq3qDtz58Xxp; Fri, 26 Jan 2024 17:48: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 4TM4tq3HGNz3xC8; Fri, 26 Jan 2024 17:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706291331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+7hpcgXh+kNZ0RLL4S823/qBuFWcnCdyT0sWKOADlA=; b=FqoAHYTEaOiviGPbtLNyvZhNFC9B74s/Q15Lh8XbwV9Hdxg+uDScIkRd/7M45Ee1EpjkTh KjaqL0mQQlQxfcVibUQzMm0JRuLTmqXfUg3EvIRi6w8I4/H8Ki930o29MUMwFcvlv08hcU Lgt/F7S3uVKrQFp6tzEPYz+Pvj90XLobglP2iK9ftoVlFcLc0nS3/f8bJ7HTrCYZjYlGvE 8MOA+36HMqgEH4CfWE52M33v9bqex2/1yD4kWgVp5zjPriVQGMMgmB5BPgyunigCLkUmhM TngYs+hKz0tqQhtljoPyS/p5+pvmuu4DQKQHe6yEBhxWGjX04d0z5hRV9FANew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706291331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+7hpcgXh+kNZ0RLL4S823/qBuFWcnCdyT0sWKOADlA=; b=yfwbBkiA4x5d/Z75XeLF/zfg+IDx6KYGVRmtYsZwBqtZzwovEFaIHH4rJqygiMQQFn3rq5 4wR+vyJ8p6J5Pu/pL6P3E5zgSox4+P4a2g/ph/5ejGsi2n1o4pUuNd2Q2awmCIl/0kzGwO u7hJ3lojw1If7osXYYF/SfDDNWzcAJZ4E+0ix/dXGi5Jl36LpOaSN7KIRvpURjC/SwLfSn mRGOi6l60l2S4XzoTXf9x2t7nbSNaf49oMquVkNkvc2SvXT+qKWhrx5X3hJ6N5F5wWZVbE zPhzcXQkqxLQ1qrHaYOHuaLyFmEpB7NvDVKP1edTLsAdl8z6dxL0s6bOvCJtEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706291331; a=rsa-sha256; cv=none; b=XzDzstUvDFjVG59sC8d5MnvEFI7XPqzPhXv3oQWuwMzvGGJo380BykpxspErxXMgD1aojq fsVvMQAQ9OCmMKfv4TIlgmECcuBVHidABviUpX8oiswUHBqnHGQ2j0NWuUiuD8AL/Cjfkj ChoEzay8YyesQQUMZbcenFrXfME+zJ5nEZP3Rhf7qwmuUmO+HzhJy0QvusOOcpnPPWl/yV hHZDr6k9/lO3r7as71kuKO9hXAXY91JePF9ouzhbor6G+gilJKazZ0SLZCb5K6nQYqtdtq EGOGEIzklhfvVETrvWmFSDw4PyxKexPlQUl+hirI1RqrxecIYkwhbDVIJMF+Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM4tq1wKfzrcx; Fri, 26 Jan 2024 17:48: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 40QHmp5D047761; Fri, 26 Jan 2024 17:48:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QHmplP047758; Fri, 26 Jan 2024 17:48:51 GMT (envelope-from git) Date: Fri, 26 Jan 2024 17:48:51 GMT Message-Id: <202401261748.40QHmplP047758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: ab0841bdbe84 - main - jail: expose children.max and children.cur via sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab0841bdbe8460db6eb77e0228a08812ce74d583 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=ab0841bdbe8460db6eb77e0228a08812ce74d583 commit ab0841bdbe8460db6eb77e0228a08812ce74d583 Author: Jamie Gritton AuthorDate: 2024-01-26 17:45:40 +0000 Commit: Jamie Gritton CommitDate: 2024-01-26 17:45:40 +0000 jail: expose children.max and children.cur via sysctl Submitted by: Igor Ostapenko Differential Revision: --- sys/kern/kern_jail.c | 29 +++++++++++ sys/kern/sysctl_security_jail_children.sh | 80 +++++++++++++++++++++++++++++++ tests/sys/kern/Makefile | 2 + 3 files changed, 111 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 0ae1d9a02f60..fb674b991a73 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4468,6 +4468,35 @@ SYSCTL_PROC(_security_jail, OID_AUTO, devfs_ruleset, sysctl_jail_default_level, "I", "Ruleset for the devfs filesystem in jail (deprecated)"); +SYSCTL_NODE(_security_jail, OID_AUTO, children, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "Limits and stats of child jails"); + +static int +sysctl_jail_children(SYSCTL_HANDLER_ARGS) +{ + struct prison *pr; + int i; + + pr = req->td->td_ucred->cr_prison; + + switch (oidp->oid_kind & CTLTYPE) { + case CTLTYPE_INT: + i = *(int *)((char *)pr + arg2); + return (SYSCTL_OUT(req, &i, sizeof(i))); + } + + return (0); +} + +SYSCTL_PROC(_security_jail_children, OID_AUTO, max, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, + NULL, offsetof(struct prison, pr_childmax), sysctl_jail_children, + "I", "Maximum number of child jails"); +SYSCTL_PROC(_security_jail_children, OID_AUTO, cur, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, + NULL, offsetof(struct prison, pr_childcount), sysctl_jail_children, + "I", "Current number of child jails"); + /* * Nodes to describe jail parameters. Maximum length of string parameters * is returned in the string itself, and the other parameters exist merely diff --git a/sys/kern/sysctl_security_jail_children.sh b/sys/kern/sysctl_security_jail_children.sh new file mode 100644 index 000000000000..0423cf1e8a59 --- /dev/null +++ b/sys/kern/sysctl_security_jail_children.sh @@ -0,0 +1,80 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Igor Ostapenko +# +# 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. + +# +# Even being is_exclusive="true" this test does not expect a host to spawn +# other jails during the test execution. +# +atf_test_case "max_cur" "cleanup" +max_cur_head() +{ + atf_set descr 'Test maximum and current number of child jails' + atf_set require.user root +} +max_cur_body() +{ + origin_max=$(sysctl -n security.jail.children.max) + origin_cur=$(sysctl -n security.jail.children.cur) + + # Magic numbers reasoning: + # 3 stands for: + # - the test creates three jails: childfree, maxallowed, maxallowed.family + # 6 stands for: + # - maxallowed.family wants to set children.max=4 + # - it means that its parent (maxallowed) should have at least children.max=5 + # - it makes the origin (parent of maxallowed) provide children.max=6 minimum + # + test $origin_cur -le $origin_max || atf_fail "Abnormal cur=$origin_cur > max=$origin_max." + test $((origin_max - origin_cur)) -ge 3 || atf_skip "Not enough child jails are allowed for the test." + test $origin_max -ge 6 || atf_skip "Not high enough children.max limit for the test." + + jail -c name=childfree persist + atf_check_equal "$((origin_cur + 1))" "$(sysctl -n security.jail.children.cur)" + atf_check_equal "0" "$(jexec childfree sysctl -n security.jail.children.max)" + atf_check_equal "0" "$(jexec childfree sysctl -n security.jail.children.cur)" + + jail -c name=maxallowed children.max=$((origin_max - 1)) persist + atf_check_equal "$((origin_cur + 2))" "$(sysctl -n security.jail.children.cur)" + atf_check_equal "$((origin_max - 1))" "$(jexec maxallowed sysctl -n security.jail.children.max)" + atf_check_equal "0" "$(jexec maxallowed sysctl -n security.jail.children.cur)" + + jexec maxallowed jail -c name=family children.max=4 persist + atf_check_equal "$((origin_cur + 3))" "$(sysctl -n security.jail.children.cur)" + atf_check_equal "1" "$(jexec maxallowed sysctl -n security.jail.children.cur)" + atf_check_equal "4" "$(jexec maxallowed.family sysctl -n security.jail.children.max)" + atf_check_equal "0" "$(jexec maxallowed.family sysctl -n security.jail.children.cur)" +} +max_cur_cleanup() +{ + jail -r maxallowed + jail -r childfree + return 0 +} + +atf_init_test_cases() +{ + atf_add_test_case "max_cur" +} diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 7b5d87ff30ac..5a7e27319ddb 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -59,6 +59,8 @@ ATF_TESTS_SH+= sonewconn_overflow TEST_METADATA.sonewconn_overflow+= required_programs="python" TEST_METADATA.sonewconn_overflow+= required_user="root" ATF_TESTS_SH+= sendfile_test +ATF_TESTS_SH+= sysctl_security_jail_children +TEST_METADATA.sysctl_security_jail_children+= is_exclusive="true" ${PACKAGE}FILES+= sonewconn_overflow.py ${PACKAGE}FILESMODE_sonewconn_overflow.py=0555 From nobody Fri Jan 26 21:02:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Bj0l2fz58qgx; Fri, 26 Jan 2024 21:02: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 4TM9Bj0H6Mz4Lv1; Fri, 26 Jan 2024 21:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2WUUB72SXqsYYJlyF/eo6zYFkD3XgrJHAP2SnWXEmI=; b=HDLXugR8koe/eaY53qbt1POVf0dwF4E7ijcrGmek6wJP7XM0yOqfXkEEhSa4aTXzQYQNvv 4dP8sSE97hC5w+HCBE6izYVVtEje1belI6Lja4Ex/MXsbxks04FQSxJYH+wYm1WBweMjeE TWh/2O/svyb+3sGSCTLIovZ1GZEY3p9pj14ZX2Wi5L3gX+DIh1V5hNdbE77hLIzYvL5McC MHCrr/4TNtzWU7YwqKQDNUspm1O9ayPKMtVGt6mLruOqsrKUj3DGjsY/ZiOfuNdzyrgbYw 9dW0rIcabSys+mzvRXVZ4Bt+T52QcNMM4zVdSI06BQa22xnpNDS0lrfd6NXNAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2WUUB72SXqsYYJlyF/eo6zYFkD3XgrJHAP2SnWXEmI=; b=ouXazKHTmPTxZDfIjL3p2bmOHOzglwIEx1AM/IditTnXuaRPMXaubrhwjVcv2OjhFg0Ffr a7wbfgCJ1tzXvEW2/q1QP3ZPLXEIpDClvKOzjZMHZS3xDyKE+ovOeR+O4a+SEE4skfIKIu WvvqDUpMetk5fJAj5lCWpj/hJenHSAkG1qeibGAhdtWvKJjefYImEEf0yfeCOVHuyS/pCW ZB72ec2FjLaZI6A0+0h2LCw6AtC2VbLDQ6lo4sawyoYUAJJKjfJXLyL3f3ZEBeO4X4fsCC 7XvyCkcMXfCsBSO4QocvzB4EuuU8PzHjkrJn4ydrey0PUezQW/I+zXHREHuBLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706302973; a=rsa-sha256; cv=none; b=wv207Tm0dFNucQ/EaSv0S2lIzdr0RKorgL9+xqQX2M2rjf+boP6nZ8KIW0kfY19vcQtXx0 F9ETyaJWCqJCB7CLXaYs+sSMbv5vQJ+ZvooMmwtOTl55n68QyJRtmMUKx6D3lRny7ZaT8e IYgAcah+LVa908QPcNb0ArDBYhAwXlhes/YmfbJd01kWxrzfLY0OhLhJuC6i94/OXr8Bh9 5H9WdtB+hFA3rsXvdf68l656tsFfjM1dX9aGxsRz1KcBQlZdYCqzTFGLO/gTUamcQeJ16A qo9U1gUKUKMeUUuk6KgVBRUx7Q5gDUQcSyE6uYPG4Gs8++W3nENED5EFC6tm+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 4TM9Bh6SDDzwVZ; Fri, 26 Jan 2024 21:02: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 40QL2q9R083750; Fri, 26 Jan 2024 21:02:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL2qmb083747; Fri, 26 Jan 2024 21:02:52 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:02:52 GMT Message-Id: <202401262102.40QL2qmb083747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: a431d0f4a2ac - stable/14 - libthr: thr_attr.c: More style and clarity fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a431d0f4a2acb70a79a84d5dd73d9593fd7481db Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a431d0f4a2acb70a79a84d5dd73d9593fd7481db commit a431d0f4a2acb70a79a84d5dd73d9593fd7481db Author: Olivier Certner AuthorDate: 2024-01-04 15:10:40 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 20:58:22 +0000 libthr: thr_attr.c: More style and clarity fixes The change of argument for sizeof() (from a type to an object) is to be consistent with the change done for the malloc() code just above in the preceding commit touching this file. Consider bit flags as integers and test whether they are set with an explicit comparison with 0. Use an explicit flag value (PTHREAD_SCOPE_SYSTEM) in place of a variable that has this value at point of substitution. All other changes are straightforward. Suggested by: kib Reviewed by: kib Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43327 (cherry picked from commit 4d312aa051414ad77d3515f258230d01ad11d6dc) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 0ccc31b22c13..bbb143da1a7d 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -117,8 +117,7 @@ _thr_attr_destroy(pthread_attr_t *attr) if (attr == NULL || *attr == NULL) return (EINVAL); - if ((*attr)->cpuset != NULL) - free((*attr)->cpuset); + free((*attr)->cpuset); free(*attr); *attr = NULL; return (0); @@ -151,7 +150,7 @@ _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) return (error); attr = pthread->attr; - if (pthread->flags & THR_FLAGS_DETACHED) + if ((pthread->flags & THR_FLAGS_DETACHED) != 0) attr.flags |= PTHREAD_DETACHED; error = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread), @@ -180,7 +179,7 @@ _thr_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate) if (attr == NULL || *attr == NULL || detachstate == NULL) return (EINVAL); - if ((*attr)->flags & PTHREAD_DETACHED) + if (((*attr)->flags & PTHREAD_DETACHED) != 0) *detachstate = PTHREAD_CREATE_DETACHED; else *detachstate = PTHREAD_CREATE_JOINABLE; @@ -258,7 +257,7 @@ _thr_attr_getscope(const pthread_attr_t * __restrict attr, if (attr == NULL || *attr == NULL || contentionscope == NULL) return (EINVAL); - *contentionscope = (*attr)->flags & PTHREAD_SCOPE_SYSTEM ? + *contentionscope = ((*attr)->flags & PTHREAD_SCOPE_SYSTEM) != 0 ? PTHREAD_SCOPE_SYSTEM : PTHREAD_SCOPE_PROCESS; return (0); } @@ -321,7 +320,7 @@ _thr_attr_init(pthread_attr_t *attr) if ((pattr = malloc(sizeof(*pattr))) == NULL) return (ENOMEM); - memcpy(pattr, &_pthread_attr_default, sizeof(struct pthread_attr)); + memcpy(pattr, &_pthread_attr_default, sizeof(*pattr)); *attr = pattr; return (0); } @@ -449,7 +448,7 @@ _thr_attr_setscope(pthread_attr_t *attr, int contentionscope) return (EINVAL); if (contentionscope == PTHREAD_SCOPE_SYSTEM) - (*attr)->flags |= contentionscope; + (*attr)->flags |= PTHREAD_SCOPE_SYSTEM; else (*attr)->flags &= ~PTHREAD_SCOPE_SYSTEM; return (0); @@ -546,6 +545,7 @@ _pthread_attr_setaffinity_np(pthread_attr_t *pattr, size_t cpusetsize, if (cpusetsize > kern_size) { /* Kernel checks invalid bits, we check it here too. */ size_t i; + for (i = kern_size; i < cpusetsize; ++i) if (((const char *)cpusetp)[i] != 0) return (EINVAL); From nobody Fri Jan 26 21:02:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Bk1pGHz58qjv; Fri, 26 Jan 2024 21:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TM9Bk1Gs9z4M1m; Fri, 26 Jan 2024 21:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNwM74lN+cYhBizjQdHYMWAZIZuX12p17DeFQD/BaK4=; b=Nfp7FZqWQ09eOgMZ17jsf9YIRFOHRKxBCW+0yBsjBQ4H6jHwnJpfiCDTRQ1QUiDSr5J21H j5x+0e4k1vT80TFoqTBw1gtYQX8PFYQi7Y7QFy/InClrKJc/gKV6fxjEF7evCMI8XCfWqH BrUYWueGxiFKYpXyi+iUXbFo2U3l5mcQEEz9Y9WkMzYsBNEv6k2GB+tscrNHrPVJ3rDM5G TOys9QM3ux3rE9SWfT6VkI0kwHjqo/hted4/CAwrGbHDZFOWofu3Enf51UhRWfxP3oxr2P znWJWatqWHUNyRunmFf5q0z6tedNfXjeZvM6MyLiZTXQdnK+BNp9ynl4vFfYzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNwM74lN+cYhBizjQdHYMWAZIZuX12p17DeFQD/BaK4=; b=FcBJ1arXarSMfGYmJmMmbBhGT2+M6QlNVpV3jY68BSQpLN0uQtt+FYEH5iuBHkUef3uO+M JqCPqSwwwijH/NMk4M8tjgskG+q//vJLXG4L5nx6r8rFLD/o/6s+CKL8sxlfs+6BlzhNm9 8M8bWu+5RtJONP6om3qmFlxK3S0A+2hA/sdawkBlVBmbylnzIdfHHpQI5txblx08aLvCYH JxSbsjO28t9HzuJrt2XzGDSC3iNvsFvc4FJo5ZwaXQuSV9wUebvgsLj86vINOhY5mxmW8k Ku1QwK4kM2ieULW5F6jobjzp526hVUmRvk+xHS33PHSvGDyK+ttJ4mXBIbDOwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706302974; a=rsa-sha256; cv=none; b=uhIKQpzxEOYSqJszIqTv5CT8x7uSvmRd8Ci3LDBb+LbxNjiqyEBxk8a/nSjM8/LxFsNUXj DCUZR6r3sUA7AqkjqzQdnjiXULJENHa4+hLjRxCxVf5LTXQPldsn2IxNxtACKLyQDO7LOL A5uXD5PysWeMz0DMkgT5H9dUuiPbeKFqofto5qn3mDE7mODSiDTgoakQrTE88a87wTJ//w SQhYNU6ALhUYp4lspwF22NpjRaymZJ4EqReSArmkUHxM5nU4d7/IFqe5m/PAAPUydDdNyJ V19AZCJG2QPn7rbdMVmhR3rZHNDitLKKimluYntEGziPbJCNtMgU6fy4gVZb3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Bk0LTjzxJQ; Fri, 26 Jan 2024 21:02:54 +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 40QL2rsf083802; Fri, 26 Jan 2024 21:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL2rhc083799; Fri, 26 Jan 2024 21:02:53 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:02:53 GMT Message-Id: <202401262102.40QL2rhc083799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 194df67ef569 - stable/14 - libhtr: pthread_attr_setaffinity_np(): Replace calloc() with malloc() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 194df67ef5691d25ed3cd4be5750eb181867cc7d Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=194df67ef5691d25ed3cd4be5750eb181867cc7d commit 194df67ef5691d25ed3cd4be5750eb181867cc7d Author: Olivier Certner AuthorDate: 2024-01-04 15:20:50 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 20:59:11 +0000 libhtr: pthread_attr_setaffinity_np(): Replace calloc() with malloc() Using calloc() instead of malloc() is useless here since the allocated memory is to be wholly crushed by the memcpy() call that follows. Suggested by: kib Reviewed by: emaste, kib Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43328 (cherry picked from commit 15bb0300eeca233827a6a13cd2ed883e0034979d) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index bbb143da1a7d..561037fa5eb4 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -551,7 +551,7 @@ _pthread_attr_setaffinity_np(pthread_attr_t *pattr, size_t cpusetsize, return (EINVAL); } if (attr->cpuset == NULL) { - attr->cpuset = calloc(1, kern_size); + attr->cpuset = malloc(kern_size); if (attr->cpuset == NULL) return (errno); attr->cpusetsize = kern_size; From nobody Fri Jan 26 21:02:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Bl46Xwz58qmT; Fri, 26 Jan 2024 21:02: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 4TM9Bl1tYmz4Lv5; Fri, 26 Jan 2024 21:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q0IEgbc48o7rDaI9lXOX7tvEZ5J97obWIkmP9kxaM0E=; b=MrfaiHiqh0sJLvd5p54k4dv7Uoze0Xcr8ErkEJaBCBpbQeHQnAjJrOt7OCmyONNdbxqx6w Vg9c5J1aboX+xe8M7VOEXe1wLJPzSNPGCoSvWMHSZ1lh6RZkirHaZQy1pVYLW8YbCfXrCH 527eU4qLqoqVJgEqFPDd+hOkiyvdgcb0LmV7QnzR4lpiCMhgt1G0o9/4rNpB6AQe/ASkSv o+89L9faSefDF/RylBh3S5Z/kys8eSdHaeOdvlqQ3+AxBS7jsLVTzp0xcJSE0dopyFe+Hm 6oUKKni9Z5XcAk2FcZ8Q8ArQ/GQBWlpWdZTos82iSat70kOmJJrKab41c39E8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q0IEgbc48o7rDaI9lXOX7tvEZ5J97obWIkmP9kxaM0E=; b=KZdFvz+136t3rGpJ2jYCe9QOKanrbcJzWMJVnduLOmE7Q2wRUsOi/xWUVP4Ja8/0PyY6zq BC8b+S7MN6L7UT2MbioHSgvU7jPBk9EQCS//Nj8V8Pk+FxAPIrWgbsc4g97xNyBnElvdle 4A3xWjOpxRwji71hY5+7Iv7cJr1PwL8VwgCmjS4pHA28fbSjPYVi3TdrhCnD1YYY+upYEa Ie09jVsS5g/nGmHUruaVTmssy1icNEHYmT+AQIFNtLQY/VOv4du5xTQ8LPz1nEPKF0hDmY LPKG+fBd/Pft460nmZxgrAxI3bvXUsa4deI1cofhZOKAHXdpUGCpIZC5ehdS+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706302975; a=rsa-sha256; cv=none; b=SOUP8b4yqnzUBx7owFgkPZ0OOY5q7r/LTVj5vEilFqsgu7NgGwe9AN+BbkUDREG/TGPvE7 MPBuRIPH8bDfJjMyaSlCOtPIellbDnedgT9MjXxDmkdCzomRBSBrDg/p3talPKdvgweRPT Ag1cQo51vUMk92hmXuQhBH9CQz1mgtVKuetBp/BLs369GjHTh1BE/0DRtiUkoT9lc5m1YO zL4XoJjOAkQgAxZXCX3uMOSk2FuZ8c0mE9oeERzq2jLz1wQq7fnvAwcHQ+ip+LO9vaggzI n7kOffx1MFlLDr/yxhmx0FeBhV/48J91GHNxtvihgAJbbhuj6ROssBakF9jawQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Bl0zGNzx2T; Fri, 26 Jan 2024 21:02: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 40QL2tNe083858; Fri, 26 Jan 2024 21:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL2tJ3083855; Fri, 26 Jan 2024 21:02:55 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:02:55 GMT Message-Id: <202401262102.40QL2tJ3083855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: f68a255ff325 - stable/14 - pthread_attr_get_np(): Use malloc(), report ENOMEM, don't tamper on error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f68a255ff325258a97edfe317ed8272d59e58104 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f68a255ff325258a97edfe317ed8272d59e58104 commit f68a255ff325258a97edfe317ed8272d59e58104 Author: Olivier Certner AuthorDate: 2024-01-04 17:45:52 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:01:30 +0000 pthread_attr_get_np(): Use malloc(), report ENOMEM, don't tamper on error Similarly as in the previous commit, using calloc() instead of malloc() is useless here in the regular case since the subsequent call to cpuset_getaffinify() is going to completely fill the allocated memory. However, there is an additional complication. This function tries to allocate memory to hold the cpuset if it previously wasn't, and does so before the thread lock is acquired, which can fail on a bad thread ID. In this case, it is necessary to deallocate the memory allocated in this function so that the attributes object appears unmodified to the caller when an error is returned. Without this, a subsequent call to pthread_attr_getaffinity_np() would expose uninitialized memory (not a security problem per se, since it comes from the same process) instead of returning a full mask as it would before the failing call to pthread_attr_get_np(). So the caller would be able to notice a change in the state of the attributes object even if pthread_attr_get_np() reported failure, which would be quite surprising. A similar problem that could occur on failure of cpuset_setaffinity() has been fixed. Finally, we shall always report memory allocation failure. This already goes for pthread_attr_init(), so, if for nothing else, just be consistent. Reviewed by: emaste, kib Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43329 (cherry picked from commit aadb4a1b3fd185d547087f6eafca6ce0b4df3291) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 45 ++++++++++++++++++++++++----------------- lib/libthr/thread/thr_private.h | 2 -- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 561037fa5eb4..3c03225c33cb 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -129,8 +129,9 @@ __weak_reference(_thr_attr_get_np, _pthread_attr_get_np); int _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) { - struct pthread_attr attr, *dst; + struct pthread_attr *dst; struct pthread *curthread; + cpuset_t *cpuset; size_t kern_size; int error; @@ -138,35 +139,43 @@ _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) return (EINVAL); kern_size = _get_kern_cpuset_size(); - if (dst->cpuset == NULL) { - dst->cpuset = calloc(1, kern_size); - dst->cpusetsize = kern_size; - } + if ((cpuset = malloc(kern_size)) == NULL) + return (ENOMEM); + } else + cpuset = dst->cpuset; curthread = _get_curthread(); /* Arg 0 is to include dead threads. */ if ((error = _thr_find_thread(curthread, pthread, 0)) != 0) - return (error); - - attr = pthread->attr; - if ((pthread->flags & THR_FLAGS_DETACHED) != 0) - attr.flags |= PTHREAD_DETACHED; + goto free_and_exit; error = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread), - dst->cpusetsize, dst->cpuset); - if (error == -1) + kern_size, cpuset); + if (error == -1) { + THR_THREAD_UNLOCK(curthread, pthread); error = errno; + goto free_and_exit; + } - THR_THREAD_UNLOCK(curthread, pthread); + /* + * From this point on, we can't fail, so we can start modifying 'dst'. + */ - if (error == 0) - memcpy(&dst->pthread_attr_start_copy, - &attr.pthread_attr_start_copy, - offsetof(struct pthread_attr, pthread_attr_end_copy) - - offsetof(struct pthread_attr, pthread_attr_start_copy)); + *dst = pthread->attr; + if ((pthread->flags & THR_FLAGS_DETACHED) != 0) + dst->flags |= PTHREAD_DETACHED; + THR_THREAD_UNLOCK(curthread, pthread); + + dst->cpuset = cpuset; + dst->cpusetsize = kern_size; return (0); + +free_and_exit: + if (dst->cpuset == NULL) + free(cpuset); + return (error); } __weak_reference(_thr_attr_getdetachstate, pthread_attr_getdetachstate); diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 3475029f8996..3fc4d02c611e 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -261,7 +261,6 @@ struct pthread_atfork { }; struct pthread_attr { -#define pthread_attr_start_copy sched_policy int sched_policy; int sched_inherit; int prio; @@ -271,7 +270,6 @@ struct pthread_attr { void *stackaddr_attr; size_t stacksize_attr; size_t guardsize_attr; -#define pthread_attr_end_copy cpuset cpuset_t *cpuset; size_t cpusetsize; }; From nobody Fri Jan 26 21:02:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Bm3tMmz58qmV; Fri, 26 Jan 2024 21:02: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 4TM9Bm2s6tz4LvL; Fri, 26 Jan 2024 21:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJMwk3sODRYH1L+PKg6sFxUAo8UDIfaezV216edF67s=; b=Pt/P6Z81VBhY/QXcawq3ngV7zWinUso6Jd46CLRwmyCDrJthZ/nrc8AUrb15BbXZjs0AJU N+hnwbCVfrAgLtoZH3zfy3TFZe0xOIkzBynLKRYyhuwNoZv3N1QSvIE1Fu/cd4upLzBlpP L3GhZCgqKVY0QJRZEjbJXl9xpUUUrHY7Qc8qvBkIrnYpawK1L5fyrJtCmL1q9nCpIlVBcU jeBsSmSkL9Se1O5exon+TJ34YakHZwAE3KqDmlzW1lRfwoOmJF4I3/57Q6jztpXdNUWSub vRR8BfwFHO9pbpn6Ghxq/nJfIPyknMelSe4A4aufnitr+BcyOCqlVcjmJTfI0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJMwk3sODRYH1L+PKg6sFxUAo8UDIfaezV216edF67s=; b=y2IFvxoEjUUaHa4aUaOTGr2s7fLTG4/yAOh9UVCpAucCG6eHoRlH35Dkjz9nBnDRWWi/PA 23TDtuCh9p8+HYvAb+zK5p7BkNPPke1C9L1NByDq8yTbEmCVGxfti6x8ivBKNbyTt8UMIP cQnVedWDwtBhhOY0VmbS/i5ifTxtv2+NqWgUPqPIC7eRjhvV0M0S64xmCEOxBu7MAIK720 84GxAEhBi6Fai18jvKBT/MelG17YjMK5XStrIVzbNLW09p1jNyAUh2H/SaGAL1FD6o3BSV 3Inmsi4ofJRk6E1QxMMJ3ckQxxbfIeXkh17g1NwJt26ffi8gA9FsXYOmr1RBAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706302976; a=rsa-sha256; cv=none; b=ExiKYgxSIKnN5xvJSaSO099q2t97IxDaQmsd7Tk/PdZp7KK55e/2uy0UDLsh5CB+uezp0I YSHiJBXQupobJCVBAL1d4EKbVU2a+qsAciJnIo3EW4aZMMvT+nWhaHwaY1FZBicuL9+arq Em8XArVrpdt8lM16obrDDr8NUM8R61e5opOPaaC0KGQeS6uclb/h/Lo/mnpkaX0TKyxjOm MbK7kjBwklmMBb3uGeDjEJYHRXYBkmx8IXYSkfRbzaorqbf9sFJRYpbKKQ5ttlFaBOq+F3 c4EuNi3nbX8UPcD4cp7IucD16E3LURWkch5XfgUvRua9OgRnOGJHrRpHJgkGhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Bm1yg0zxRb; Fri, 26 Jan 2024 21:02: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 40QL2upk083891; Fri, 26 Jan 2024 21:02:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL2ufg083888; Fri, 26 Jan 2024 21:02:56 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:02:56 GMT Message-Id: <202401262102.40QL2ufg083888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: efdf24fd9bb9 - stable/14 - pthread_attr_get_np(3): Revamp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efdf24fd9bb92a3742fb16bb39a4c9940647b1b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=efdf24fd9bb92a3742fb16bb39a4c9940647b1b4 commit efdf24fd9bb92a3742fb16bb39a4c9940647b1b4 Author: Olivier Certner AuthorDate: 2024-01-05 13:14:48 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:01:39 +0000 pthread_attr_get_np(3): Revamp Fix and more thoroughly describe the attributes object lifecycle. Also, correct the text about which attributes' values are reported. Add the ENOMEM error. While here, rephrase unclear passages, add references and fix the example's style. Reviewed by: kib, emaste Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43330 (cherry picked from commit 6211cd4be32dfdc51b5ac452d4ead98a36ec42a6) Approved by: markj (mentor) --- share/man/man3/pthread_attr_get_np.3 | 84 +++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/share/man/man3/pthread_attr_get_np.3 b/share/man/man3/pthread_attr_get_np.3 index a13835287d7f..07153586c1b2 100644 --- a/share/man/man3/pthread_attr_get_np.3 +++ b/share/man/man3/pthread_attr_get_np.3 @@ -1,5 +1,10 @@ .\" Copyright (c) 2002,2003 Alexey Zelkin .\" All rights reserved. +.\" Copyright (c) 2024 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Olivier Certner +.\" at Kumacom SARL under sponsorship from the +.\" FreeBSD Foundation. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,12 +27,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 12, 2021 +.Dd January 5, 2024 .Dt PTHREAD_ATTR_GET_NP 3 .Os .Sh NAME .Nm pthread_attr_get_np -.Nd get attributes of existent thread +.Nd get attributes of an existing thread .Sh LIBRARY .Lb libpthread .Sh SYNOPSIS @@ -37,51 +42,54 @@ .Sh DESCRIPTION The .Fn pthread_attr_get_np -function is used to get existent thread's attributes. -Most fields of -.Vt pthread_attr_t -structure are exact values of attributes provided at thread creation -time (as parameter to -.Xr pthread_create 3 -function), except for the stack address. -.Pp -Value returned as -.Fa dst -is supposed to be used in conjunction with -.Fn pthread_attr_get* -functions to retrieve individual values from +function is used to retrieve the attributes of the specified thread into an +existing .Vt pthread_attr_t structure. -Parameter -.Fa dst -should point to allocated memory area big enough to fit this structure. +The attributes' values are the current ones for the target thread, except for +the stack top address if not properly aligned for the architecture, since in +this case its value has been adjusted internally before use. .Pp -It is HIGHLY RECOMMENDED to use +Argument +.Fa dst +must be a pointer to a valid attributes object +.Po +it was initialized at some point by .Xr pthread_attr_init 3 -function to allocate attribute storage. -.Sh IMPLEMENTATION NOTES -The -.Fn pthread_attr_get_np -function will always return a pointer to the thread's real stack address, -regardless of its value in the original attributes structure. +and was not destroyed since then +.Pc . +After a successful call to +.Fn pthread_attr_get_np , +the individual attributes' values can be retrieved as usual via the +corresponding accessor functions as documented in +.Xr pthread_attr 3 . +After a failed call to +.Fn pthread_attr_get_np , +the object pointed to by +.Fa dst +is left unmodified, and can continue to be used as if the failed call never +happened. .Sh RETURN VALUES If successful, .Fn pthread_attr_get_np function returns 0. Otherwise, an error number is returned to indicate the error. .Sh EXAMPLES +This function retrieves the stack size of the thread specified by the +.Fa pid +argument: .Bd -literal size_t -my_thread_stack_size(pthread_t pid) +my_thread_stack_size(pthread_t tid) { - pthread_attr_t attr; - size_t size; + pthread_attr_t attr; + size_t size; - pthread_attr_init(&attr); - pthread_attr_get_np(pid, &attr); - pthread_attr_getstacksize(&attr, &size); - pthread_attr_destroy(&attr); - return(size); + pthread_attr_init(&attr); + pthread_attr_get_np(tid, &attr); + pthread_attr_getstacksize(&attr, &size); + pthread_attr_destroy(&attr); + return (size); } .Ed .Sh ERRORS @@ -90,12 +98,16 @@ The function will fail if: .Bl -tag -width Er .It Bq Er EINVAL -Invalid value for one of given parameters. +One of the arguments has an invalid value. .It Bq Er ESRCH No thread could be found corresponding to that specified by the given thread ID. +.It Bq Er ENOMEM +There was not enough memory to allocate additional storage needed by the attributes +object's implementation. .El .Sh SEE ALSO +.Xr pthread_attr 3 , .Xr pthread_attr_destroy 3 , .Xr pthread_attr_getdetachstate 3 , .Xr pthread_attr_getinheritsched 3 , @@ -111,4 +123,6 @@ thread ID. The .Fn pthread_attr_get_np function and this manual page were written by -.An Alexey Zelkin Aq Mt phantom@FreeBSD.org . +.An Alexey Zelkin Aq Mt phantom@FreeBSD.org , +and the latter was revised by +.An Olivier Certner Aq Mt olce@FreeBSD.org . From nobody Fri Jan 26 21:05:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9FL0Js9z58qdy; Fri, 26 Jan 2024 21:05: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 4TM9FK69nMz4NcL; Fri, 26 Jan 2024 21:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EvCdY6LX/LDH8gH/pqtGEGWJGh0k/E6E8+2Vwm05iY=; b=EVz0Ib6mAUo2dlP2xzaAb7joYbq+hm+pb3KUOeTzYzLNXitF4Y2r+TeW63XoX+AdOGiVQy Zk6+ExMx7HfHa4qSiVWoGfIqGf7Zlz0T9Py6UzS/VAUSQYGZgGQPIxijZHeOo3d5Qh+/5t e/BaNXQhExFx9UvVdyDpzEXQeK/Cy2s9TmUcreWESgjfbhppt9+tPZSGauyjImkZXaed4l /gk0SCwRlWxbbYYgPtwleXNEFhbA167IPxAsWEqTkN1KiGxgYECWpJw0oQgDpHsemoSYH4 TxgyldfIzTzmaDTHwiRR80UGSh+J3zHSQqY9IZR35fIul6alaAb8I8nBgOjFsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EvCdY6LX/LDH8gH/pqtGEGWJGh0k/E6E8+2Vwm05iY=; b=DMZMfmUre1x4LsBWIG5ruTNFg//qRRDUQyzECZVWrY+UNktfAuAlvkziz1AQSnOTZdNnXw pB6HOp2P7xR66a4HrFtwG3y+XMnsbtct0brHQo2Te9uufERJphmqXiJ7kw0DklahTtrTzz h0s4ek7UWxie2dWDrRqliVks+w6O8XnIbht5M/3e9cjbK1oVtWZKvnCaiyl08zldHEX4WE 1+qr/pyU/wLBqwbdMrLf31Q/e66MxKRmZLdKq2V74k2IdtQB4GDtbobMk71Y2vMCWvaO14 ClV++6sDz3tDWin5Tucgd2NKVQETf1iJrarp9XUXKgCaa/tOjvQprb5oOlI1Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303109; a=rsa-sha256; cv=none; b=hv7Cj4OJ+l+bMxUaYfh6nJ2Ug1uiYLdPHqu41fVo1xwaGsUs2BVAkB8xEzyJPf6GCJCFfT PcrxVJfobKnUNT0BG79OQ0n9c+FwnMInyUhKecgeFSO2qM1Q95N0IzE7jQyPKYvcFVatT9 ZSe2I94V1XLHCvYUbiq/9/YFfwT5PB+mczw9kWvjVteEjLsfNMCmsJoxZXRMuZEZssywmI ei80oACcmBZdleH3u+L8TdRuX2deROGnQI8nooHCyiCGe4yMp4Bo1SkMNmlJE3TpFqK/j5 6Rlszaw8y8+1JKZvGKpvwd9Yw05msZCK+R1EFAobkpOhWiYRf+7m3122B0TmFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9FK5GZLzxZs; Fri, 26 Jan 2024 21:05: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 40QL59cI084359; Fri, 26 Jan 2024 21:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL59Np084356; Fri, 26 Jan 2024 21:05:09 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:05:09 GMT Message-Id: <202401262105.40QL59Np084356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 8bd4bf5db4c3 - stable/13 - libthr: thr_attr.c: More style and clarity fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8bd4bf5db4c3de931bd18c5b57ca98cd9c980ede Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd4bf5db4c3de931bd18c5b57ca98cd9c980ede commit 8bd4bf5db4c3de931bd18c5b57ca98cd9c980ede Author: Olivier Certner AuthorDate: 2024-01-04 15:10:40 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:04:20 +0000 libthr: thr_attr.c: More style and clarity fixes The change of argument for sizeof() (from a type to an object) is to be consistent with the change done for the malloc() code just above in the preceding commit touching this file. Consider bit flags as integers and test whether they are set with an explicit comparison with 0. Use an explicit flag value (PTHREAD_SCOPE_SYSTEM) in place of a variable that has this value at point of substitution. All other changes are straightforward. Suggested by: kib Reviewed by: kib Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43327 (cherry picked from commit 4d312aa051414ad77d3515f258230d01ad11d6dc) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 0ccc31b22c13..bbb143da1a7d 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -117,8 +117,7 @@ _thr_attr_destroy(pthread_attr_t *attr) if (attr == NULL || *attr == NULL) return (EINVAL); - if ((*attr)->cpuset != NULL) - free((*attr)->cpuset); + free((*attr)->cpuset); free(*attr); *attr = NULL; return (0); @@ -151,7 +150,7 @@ _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) return (error); attr = pthread->attr; - if (pthread->flags & THR_FLAGS_DETACHED) + if ((pthread->flags & THR_FLAGS_DETACHED) != 0) attr.flags |= PTHREAD_DETACHED; error = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread), @@ -180,7 +179,7 @@ _thr_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate) if (attr == NULL || *attr == NULL || detachstate == NULL) return (EINVAL); - if ((*attr)->flags & PTHREAD_DETACHED) + if (((*attr)->flags & PTHREAD_DETACHED) != 0) *detachstate = PTHREAD_CREATE_DETACHED; else *detachstate = PTHREAD_CREATE_JOINABLE; @@ -258,7 +257,7 @@ _thr_attr_getscope(const pthread_attr_t * __restrict attr, if (attr == NULL || *attr == NULL || contentionscope == NULL) return (EINVAL); - *contentionscope = (*attr)->flags & PTHREAD_SCOPE_SYSTEM ? + *contentionscope = ((*attr)->flags & PTHREAD_SCOPE_SYSTEM) != 0 ? PTHREAD_SCOPE_SYSTEM : PTHREAD_SCOPE_PROCESS; return (0); } @@ -321,7 +320,7 @@ _thr_attr_init(pthread_attr_t *attr) if ((pattr = malloc(sizeof(*pattr))) == NULL) return (ENOMEM); - memcpy(pattr, &_pthread_attr_default, sizeof(struct pthread_attr)); + memcpy(pattr, &_pthread_attr_default, sizeof(*pattr)); *attr = pattr; return (0); } @@ -449,7 +448,7 @@ _thr_attr_setscope(pthread_attr_t *attr, int contentionscope) return (EINVAL); if (contentionscope == PTHREAD_SCOPE_SYSTEM) - (*attr)->flags |= contentionscope; + (*attr)->flags |= PTHREAD_SCOPE_SYSTEM; else (*attr)->flags &= ~PTHREAD_SCOPE_SYSTEM; return (0); @@ -546,6 +545,7 @@ _pthread_attr_setaffinity_np(pthread_attr_t *pattr, size_t cpusetsize, if (cpusetsize > kern_size) { /* Kernel checks invalid bits, we check it here too. */ size_t i; + for (i = kern_size; i < cpusetsize; ++i) if (((const char *)cpusetp)[i] != 0) return (EINVAL); From nobody Fri Jan 26 21:05:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9FM2lcrz58qhd; Fri, 26 Jan 2024 21:05: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 4TM9FM07Kdz4NlR; Fri, 26 Jan 2024 21:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56E5W0vYAWuvmcOjQCmVpWECLyf3WOkdmUWA97vp6qY=; b=WYeWlNsnDD8+mXb1clUHokxxq8Mux63hZAfUscRZwgruGAaqXlAkUN6hn8/JyDwjvoFhY7 S9Ss2mEKCxp30I1Myt5L7zqN20HHoj7tS6BVzJriZLljAcwXdBtMh4kSFbPSGwAVMcRk7q HKeyJnYJ+pXQjzim5mjRULzCvk069gUONPt8ZBFCL7c45UuIweTWjjO2D0XZDOgc5mipB1 8J3tAjWzfLSMZ5lFzfVkY7G/WiFiluZrhBL8fCfqK2xOWAFfNGKRzo+s7+EehElpIe33uo aJ31Tk+H9VO5f5SMw5uwADtwk5yZJQc6uxR9ZASagjPgxM5YFx4ugRRCcwEinQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56E5W0vYAWuvmcOjQCmVpWECLyf3WOkdmUWA97vp6qY=; b=JQffvVSa/avhPYoYDIAYFOzE3fy/m9Xxtyti9JDU1iDjSQjG2MOe4F9s7ZbY0Lr1Gw3f0y /f0OlLDc5EVXxqUM5ZP0tM17ayXyZXKfckWsRn7bj5x0SvMpHsyQo0yADSWunA1HOHnltt wOkzlNjlWjZ4gV85sD22GgdHKIGu8NESB7H1rrKjbJ3nnN85mHXstJZaz0wr4OJ3bFssiI 3Ss3xdZwImvkFKtAI0iz91imbf4oeGUycC51uGJ1NqqNVOERo0/dE2o8m9yexB/Jb5RNhW PW31y/+5mdhete55Jun9fc1erNYW+ENg3JouNOS++UGj5F+wb4baPIzZ7QAXDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303111; a=rsa-sha256; cv=none; b=nsNjIwJpZzptONJKxe6xQo4vURYITl8OEld/FfQtxkte+/LYr8N4UeLvbR8ccr65VpwOEp 1vF4KUzdsukrc0SqvRQkpF7rchSa9UvfoOAU8y8aMB6mXydoWh55dPm7EWABZTMJj3Ngth OXoLGtFyzYJ3LH/DDU+VIldMerPkdZLVE1lVavb+w0CJX/kf3h/V/zLP4K4Bqkkt/aZRS2 mPq54lXvgx6WvtY72UValm+H3vZfvPvfLfc6iUGQEMdYYRzGSPjVNmbQw1oYEe/rMnikU6 2/DO590vQ26Ig68IxU0zBzY8ZNZ/3yDIGEe0oVNW/4A2QQC+NDu3CSA1l35RSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9FL6KX8zxFk; Fri, 26 Jan 2024 21:05: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 40QL5AwE084416; Fri, 26 Jan 2024 21:05:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL5AiX084413; Fri, 26 Jan 2024 21:05:10 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:05:10 GMT Message-Id: <202401262105.40QL5AiX084413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 2c9ab16625d7 - stable/13 - libhtr: pthread_attr_setaffinity_np(): Replace calloc() with malloc() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c9ab16625d7129aae29270764e6e447a5c614fd Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2c9ab16625d7129aae29270764e6e447a5c614fd commit 2c9ab16625d7129aae29270764e6e447a5c614fd Author: Olivier Certner AuthorDate: 2024-01-04 15:20:50 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:04:32 +0000 libhtr: pthread_attr_setaffinity_np(): Replace calloc() with malloc() Using calloc() instead of malloc() is useless here since the allocated memory is to be wholly crushed by the memcpy() call that follows. Suggested by: kib Reviewed by: emaste, kib Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43328 (cherry picked from commit 15bb0300eeca233827a6a13cd2ed883e0034979d) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index bbb143da1a7d..561037fa5eb4 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -551,7 +551,7 @@ _pthread_attr_setaffinity_np(pthread_attr_t *pattr, size_t cpusetsize, return (EINVAL); } if (attr->cpuset == NULL) { - attr->cpuset = calloc(1, kern_size); + attr->cpuset = malloc(kern_size); if (attr->cpuset == NULL) return (errno); attr->cpusetsize = kern_size; From nobody Fri Jan 26 21:05:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9FN2zfsz58qf1; Fri, 26 Jan 2024 21:05: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 4TM9FN0fvZz4NcZ; Fri, 26 Jan 2024 21:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6eGYilJTz5X8xJz0FYLP/CN81mVioF+p6xpXVmuTR9M=; b=K34ub2G69SIFLAi6fNIS2DVJ1v+t8I7psl9NKK8QCGV+v1uyB8lajZFYrnRMjELTaIoTic s9P1ZDk6uqHA559l/tGvFlP1Zn1126/FWjX6diSNhIH1qyHNQW4IqT15HWW6VIqLmfHvDR GTYqh5WoL0H7gYQBS9VVkO6AaOV1AV8k5H6IPTF/PatTWVzr4uu2PygaCIxXZ7ZEmJJeBo 8yyO4PcRiS5gCmQ7OClXVelFb9wb/+vjqKs4wPGC5M33H+UqPmEnKaB3Eu2ZNfp1mZ6DIJ W0WT8Mv1VcZ65Xnjwr3jqnP+SLjz5Kx6Q7hnD/5iaTD0TLK4f7e56jGxeLKb9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6eGYilJTz5X8xJz0FYLP/CN81mVioF+p6xpXVmuTR9M=; b=XdM55kNwevIUfz9ew+YyIJApkHX6CZEsZoERq3Ds/LvMmvgJ8bncF9dRE1ilParcZaNUpm FfTmzIsVAz3Zn6ucBxUmZeQzkoLSF3nEhfpkh/qxdl6awpO4UIs3GvstuMneFe6v9qY6ws i0haKbBYzriDAhreo1MEDakYO6o1KNvEgn71O7ULmC9e3LUpk+rv6/XWibF3dwuG8MEBwZ qaMCoXWRGxwiONeEARr+z38TV90pmmAHJy96t/s+11IfGJFa0n0EwVrpeNJ+7KyR9+Y5hq DY7g7XNOb72JoOO2n7cm7zPgk5j6O2bv9oYcpvAniTN+K31sckgAjb2w6tx0JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303112; a=rsa-sha256; cv=none; b=rySgz5UTguLJsAgq4pZYyuqxrTtWvPC0s3VNmwLe07pkKtikOqq+Z7p2+/+W1G2e1+VE1Q R/dvaDvFP9w3fP0K0Uf6l2DlsebPpLJurgBtsKLx2Oimz+nhxkj7WC1A/9wUI+mVJ81GeA 1V61Q5LE6AJ8/eJcBZj8xczD2XKS27T9y9JS8Q8uIyfANvK0Ltp8AqJLcx2b4SiAmdQb3Y AggpMsn4HUnjM6rg/SJHc1+ifnvCAtQhGJAp4sw03eTs35E6GOa+fmqpSQJkKNrlXr+yPv i5Kx05eeYhysvCepTpkVUC1eg4zdH6awj4SCtZBaOHbhuIx6KADjK7QQUzy2Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9FM6sLbzx2X; Fri, 26 Jan 2024 21:05: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 40QL5BRM084473; Fri, 26 Jan 2024 21:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL5B1H084470; Fri, 26 Jan 2024 21:05:11 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:05:11 GMT Message-Id: <202401262105.40QL5B1H084470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: b95b9505acf1 - stable/13 - pthread_attr_get_np(): Use malloc(), report ENOMEM, don't tamper on error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b95b9505acf176ca8b058286c74847f4a49856e9 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b95b9505acf176ca8b058286c74847f4a49856e9 commit b95b9505acf176ca8b058286c74847f4a49856e9 Author: Olivier Certner AuthorDate: 2024-01-04 17:45:52 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:04:39 +0000 pthread_attr_get_np(): Use malloc(), report ENOMEM, don't tamper on error Similarly as in the previous commit, using calloc() instead of malloc() is useless here in the regular case since the subsequent call to cpuset_getaffinify() is going to completely fill the allocated memory. However, there is an additional complication. This function tries to allocate memory to hold the cpuset if it previously wasn't, and does so before the thread lock is acquired, which can fail on a bad thread ID. In this case, it is necessary to deallocate the memory allocated in this function so that the attributes object appears unmodified to the caller when an error is returned. Without this, a subsequent call to pthread_attr_getaffinity_np() would expose uninitialized memory (not a security problem per se, since it comes from the same process) instead of returning a full mask as it would before the failing call to pthread_attr_get_np(). So the caller would be able to notice a change in the state of the attributes object even if pthread_attr_get_np() reported failure, which would be quite surprising. A similar problem that could occur on failure of cpuset_setaffinity() has been fixed. Finally, we shall always report memory allocation failure. This already goes for pthread_attr_init(), so, if for nothing else, just be consistent. Reviewed by: emaste, kib Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43329 (cherry picked from commit aadb4a1b3fd185d547087f6eafca6ce0b4df3291) Approved by: markj (mentor) --- lib/libthr/thread/thr_attr.c | 45 ++++++++++++++++++++++++----------------- lib/libthr/thread/thr_private.h | 2 -- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 561037fa5eb4..3c03225c33cb 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -129,8 +129,9 @@ __weak_reference(_thr_attr_get_np, _pthread_attr_get_np); int _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) { - struct pthread_attr attr, *dst; + struct pthread_attr *dst; struct pthread *curthread; + cpuset_t *cpuset; size_t kern_size; int error; @@ -138,35 +139,43 @@ _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr) return (EINVAL); kern_size = _get_kern_cpuset_size(); - if (dst->cpuset == NULL) { - dst->cpuset = calloc(1, kern_size); - dst->cpusetsize = kern_size; - } + if ((cpuset = malloc(kern_size)) == NULL) + return (ENOMEM); + } else + cpuset = dst->cpuset; curthread = _get_curthread(); /* Arg 0 is to include dead threads. */ if ((error = _thr_find_thread(curthread, pthread, 0)) != 0) - return (error); - - attr = pthread->attr; - if ((pthread->flags & THR_FLAGS_DETACHED) != 0) - attr.flags |= PTHREAD_DETACHED; + goto free_and_exit; error = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread), - dst->cpusetsize, dst->cpuset); - if (error == -1) + kern_size, cpuset); + if (error == -1) { + THR_THREAD_UNLOCK(curthread, pthread); error = errno; + goto free_and_exit; + } - THR_THREAD_UNLOCK(curthread, pthread); + /* + * From this point on, we can't fail, so we can start modifying 'dst'. + */ - if (error == 0) - memcpy(&dst->pthread_attr_start_copy, - &attr.pthread_attr_start_copy, - offsetof(struct pthread_attr, pthread_attr_end_copy) - - offsetof(struct pthread_attr, pthread_attr_start_copy)); + *dst = pthread->attr; + if ((pthread->flags & THR_FLAGS_DETACHED) != 0) + dst->flags |= PTHREAD_DETACHED; + THR_THREAD_UNLOCK(curthread, pthread); + + dst->cpuset = cpuset; + dst->cpusetsize = kern_size; return (0); + +free_and_exit: + if (dst->cpuset == NULL) + free(cpuset); + return (error); } __weak_reference(_thr_attr_getdetachstate, pthread_attr_getdetachstate); diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 3475029f8996..3fc4d02c611e 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -261,7 +261,6 @@ struct pthread_atfork { }; struct pthread_attr { -#define pthread_attr_start_copy sched_policy int sched_policy; int sched_inherit; int prio; @@ -271,7 +270,6 @@ struct pthread_attr { void *stackaddr_attr; size_t stacksize_attr; size_t guardsize_attr; -#define pthread_attr_end_copy cpuset cpuset_t *cpuset; size_t cpusetsize; }; From nobody Fri Jan 26 21:05:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9FP2pBTz58qf2; Fri, 26 Jan 2024 21:05: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 4TM9FP1fcLz4Nm6; Fri, 26 Jan 2024 21:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8gL9D9/x/DQomsu8fEvcznmdCirXsVIdB8Or1jbYfY=; b=X+hk9N4NDJtt0BleKxpkV6KV4sFOj+RwiYhj77ncIcUIU6ZzFYQmGywA0huRenEivdDKox HzccfELBkkAVkBW3EEAe0MMccHi2jVWlNXhkKiEH9xPdt3r6GGF2XGDEjA2ujD4Z4NHeId huu/LM/amdQwK7R1UsZwPusJ24fuN/STNf8OyFIWywkVinapB2mXl0utI4+5Qr5uRorsf7 SnloRuRcZnShFvtpujVlpbWtzmGztrliTXISKF96KYbprhG/SYQNvTqFXGWa5M2s3bs3Yz dKzXJlwxTiZuul9qlRRt3/pxNk61Bx+GkGuEFUdrjSUMafWUlBsd4N5Hi9JV2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8gL9D9/x/DQomsu8fEvcznmdCirXsVIdB8Or1jbYfY=; b=sNIu9aVqRIRFpFaJyU6GMxQlQQlOyX/2NkftX/dMi1IX2TBA5Z1bRcYml9y35/vBLA0c5H Ilv4yst3XZ3qNJZGru2FyHGqzxA9AZG6nMB4sgVNqbMTYebIN/VVERHOhBNE1dCiAyF/ct pobrGCHc2vnY9qnc43COvPmPuvT8EVBx49cJhC6O+7ex/eDotzWnR22LpJ3JiId+7W42CP OmWUJngCZDs1FIiHotoVhdWiVAPiUp+N2+l2sSShW0dvhPbRmwydI6BCw5L9gOmm84S26F 68pXngGu6OYC+g9aBOFzzY6Q/7Ax0atvOUGyon3yaPVEaNEOrH1Jaj91QIkIAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303113; a=rsa-sha256; cv=none; b=Lf6pRO2UWL6OyuFKtY8A46oqjE5RH8aH7fz9PqEl1Q/+ZurjmWHtPnVBxSRjgZlHJKfTph f745ZLcROQgUE+Ao4FZfeGSJJxD5xwo+JC9pNhvCpHgI30uXOUDDYgoBMQ9jbVJDLyOwml ZqZLKmDXwnRWmgNtSpuBXeYsO/FJrStC2pN7RbFMe/QdvqPerJvorxmqZcjN3jhbDuV18y NjRcI1hfkxS4qMNnABjguVZuXVAoBuq3LcthyMlc7cPE42z+jdGQCSiTpdm4ux0vlbyrgX 7VB14eh1+OLsllxdfqpTw72croAlVH4TgPOFamPwMyQvpthWYTpMfrGzgGz+OA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9FP0k5tzxXT; Fri, 26 Jan 2024 21:05: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 40QL5Ddi084507; Fri, 26 Jan 2024 21:05:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL5DOX084504; Fri, 26 Jan 2024 21:05:13 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:05:13 GMT Message-Id: <202401262105.40QL5DOX084504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 72ef14799d4c - stable/13 - pthread_attr_get_np(3): Revamp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 72ef14799d4c084494078b56acefb0272419c519 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=72ef14799d4c084494078b56acefb0272419c519 commit 72ef14799d4c084494078b56acefb0272419c519 Author: Olivier Certner AuthorDate: 2024-01-05 13:14:48 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:04:46 +0000 pthread_attr_get_np(3): Revamp Fix and more thoroughly describe the attributes object lifecycle. Also, correct the text about which attributes' values are reported. Add the ENOMEM error. While here, rephrase unclear passages, add references and fix the example's style. Reviewed by: kib, emaste Approved by: emaste (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43330 (cherry picked from commit 6211cd4be32dfdc51b5ac452d4ead98a36ec42a6) Approved by: markj (mentor) --- share/man/man3/pthread_attr_get_np.3 | 84 +++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/share/man/man3/pthread_attr_get_np.3 b/share/man/man3/pthread_attr_get_np.3 index a13835287d7f..07153586c1b2 100644 --- a/share/man/man3/pthread_attr_get_np.3 +++ b/share/man/man3/pthread_attr_get_np.3 @@ -1,5 +1,10 @@ .\" Copyright (c) 2002,2003 Alexey Zelkin .\" All rights reserved. +.\" Copyright (c) 2024 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Olivier Certner +.\" at Kumacom SARL under sponsorship from the +.\" FreeBSD Foundation. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,12 +27,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 12, 2021 +.Dd January 5, 2024 .Dt PTHREAD_ATTR_GET_NP 3 .Os .Sh NAME .Nm pthread_attr_get_np -.Nd get attributes of existent thread +.Nd get attributes of an existing thread .Sh LIBRARY .Lb libpthread .Sh SYNOPSIS @@ -37,51 +42,54 @@ .Sh DESCRIPTION The .Fn pthread_attr_get_np -function is used to get existent thread's attributes. -Most fields of -.Vt pthread_attr_t -structure are exact values of attributes provided at thread creation -time (as parameter to -.Xr pthread_create 3 -function), except for the stack address. -.Pp -Value returned as -.Fa dst -is supposed to be used in conjunction with -.Fn pthread_attr_get* -functions to retrieve individual values from +function is used to retrieve the attributes of the specified thread into an +existing .Vt pthread_attr_t structure. -Parameter -.Fa dst -should point to allocated memory area big enough to fit this structure. +The attributes' values are the current ones for the target thread, except for +the stack top address if not properly aligned for the architecture, since in +this case its value has been adjusted internally before use. .Pp -It is HIGHLY RECOMMENDED to use +Argument +.Fa dst +must be a pointer to a valid attributes object +.Po +it was initialized at some point by .Xr pthread_attr_init 3 -function to allocate attribute storage. -.Sh IMPLEMENTATION NOTES -The -.Fn pthread_attr_get_np -function will always return a pointer to the thread's real stack address, -regardless of its value in the original attributes structure. +and was not destroyed since then +.Pc . +After a successful call to +.Fn pthread_attr_get_np , +the individual attributes' values can be retrieved as usual via the +corresponding accessor functions as documented in +.Xr pthread_attr 3 . +After a failed call to +.Fn pthread_attr_get_np , +the object pointed to by +.Fa dst +is left unmodified, and can continue to be used as if the failed call never +happened. .Sh RETURN VALUES If successful, .Fn pthread_attr_get_np function returns 0. Otherwise, an error number is returned to indicate the error. .Sh EXAMPLES +This function retrieves the stack size of the thread specified by the +.Fa pid +argument: .Bd -literal size_t -my_thread_stack_size(pthread_t pid) +my_thread_stack_size(pthread_t tid) { - pthread_attr_t attr; - size_t size; + pthread_attr_t attr; + size_t size; - pthread_attr_init(&attr); - pthread_attr_get_np(pid, &attr); - pthread_attr_getstacksize(&attr, &size); - pthread_attr_destroy(&attr); - return(size); + pthread_attr_init(&attr); + pthread_attr_get_np(tid, &attr); + pthread_attr_getstacksize(&attr, &size); + pthread_attr_destroy(&attr); + return (size); } .Ed .Sh ERRORS @@ -90,12 +98,16 @@ The function will fail if: .Bl -tag -width Er .It Bq Er EINVAL -Invalid value for one of given parameters. +One of the arguments has an invalid value. .It Bq Er ESRCH No thread could be found corresponding to that specified by the given thread ID. +.It Bq Er ENOMEM +There was not enough memory to allocate additional storage needed by the attributes +object's implementation. .El .Sh SEE ALSO +.Xr pthread_attr 3 , .Xr pthread_attr_destroy 3 , .Xr pthread_attr_getdetachstate 3 , .Xr pthread_attr_getinheritsched 3 , @@ -111,4 +123,6 @@ thread ID. The .Fn pthread_attr_get_np function and this manual page were written by -.An Alexey Zelkin Aq Mt phantom@FreeBSD.org . +.An Alexey Zelkin Aq Mt phantom@FreeBSD.org , +and the latter was revised by +.An Olivier Certner Aq Mt olce@FreeBSD.org . From nobody Fri Jan 26 21:11:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Nb3GPVz58r55; Fri, 26 Jan 2024 21:11: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 4TM9Nb2j9mz4R8F; Fri, 26 Jan 2024 21:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n/Evg1IeKMGhgLJ6QLIVR1NIRbIKjgeZBeGox/TQKBs=; b=CGwmDsrWOZH/fAFxjHlScGD7WvISNTv0l/KGZ4tIQDebu4bM1UI9A71L1M0nmF6aO3qYBQ ZfS6VemN2Dxtm3D9GYpl25b4z5S0bnnLZZi98hZxEShuUTk/mM4z/PgCm5/xfNZWPDJQeH 37Dh1SJlnnT8UDd7UKTWE3btHDs/lIvdwvNLPh4P2WaKS8sHlqpfW24jy/CYl1zfqnL8ZB 5GidPdXgCN55+7/8+owJkJZaX1iijrYYmsgEYff/KuDhd51F+tn1XQDgEoUNPwRcnrAHrl gIGDuyFNAvrDN1RbyDfOJAEvZPHr07cipN38JjlJ4z6KSzMmVVZauCebvVNzBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n/Evg1IeKMGhgLJ6QLIVR1NIRbIKjgeZBeGox/TQKBs=; b=d9YAg8Fcmemc2cbVPMkvjHd8lsMhbmKpe+NHCdidvNbC/jgzc09I3guv+Y9DhkHdVCGUi5 UY914bFtuMrUCf4ajbZJAeyoE/2+JeV9waDaPrezML2l7hPiimPzoRE3jhUiGVcZt8q0Dy kwSqknG1TLjiTE2j+zgNsNqaITZkFEaRA8ZthB7503cs2uIvGrRp6aB1BFOh08MKplM98F S/lltIJyWsjIlid2WRyd13ey+95atzwynlD6tMbjohYXixJijFblyFynamQqRSncxIIvMA Ea2UqE8qTN3Rae/neWWz1CZ+0tRFIDl5bx3LM79mSQyi+rnfVsQW2e+GQJlwDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303487; a=rsa-sha256; cv=none; b=GVF935jeQi6gExhJdt4DNF2bum+LSCp+FLuRWmLD/LqqGuyxwmDbGLodQGH+hc6w3oNN0z 99TfHRYXnyR/zyVjVnpJy1JzTYkaF2UZt2yPQK/FNmDTW04aQ/SoYUqKQv+IsNBsAtBBaz v+7qsyCzaXWoP1ULJKDr5NId3lMizC2ubexPC6ZNWiV4wZB6k/ZsYChU1qz0Nn7/a1XsIv 5nudtTdPUXDManqjU7DLCgjvesKoIIrrlXErj5yKIn05vLmOeXlrHYpAbAGTVzXLTWWhd0 YKPFgBD0SiRD2ZlafD0gZfEq7VJfZmvlJ1luZA67akpa38dejXo6MAjdGdhLmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Nb1mXdzxVB; Fri, 26 Jan 2024 21:11:27 +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 40QLBR9B093984; Fri, 26 Jan 2024 21:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QLBROv093981; Fri, 26 Jan 2024 21:11:27 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:11:27 GMT Message-Id: <202401262111.40QLBROv093981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: eaed922eda58 - main - panic()/KERNEL_PANICKED(): Move back to using 'panicstr' as a flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eaed922eda584da7306e7c371ff6adf3fc4dc4c3 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=eaed922eda584da7306e7c371ff6adf3fc4dc4c3 commit eaed922eda584da7306e7c371ff6adf3fc4dc4c3 Author: Olivier Certner AuthorDate: 2024-01-18 10:15:18 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:07:56 +0000 panic()/KERNEL_PANICKED(): Move back to using 'panicstr' as a flag Currently, no performance-critical path tests for a panic. Moreover, we today have KERNEL_PANICKED() which wraps the test into __predict_false(), already catering to those (potential) use cases. Also, in practice we don't support 64-bit architectures without caches, so reading an 'int' instead of a pointer doesn't (directly) save any memory access. Finally, 'panicked' is redundant with 'panicstr' (and wastes a tiny amount of memory). Consequently: 1. Use again 'panicstr' as a flag indicating that the system is panicking. To this end: - Modify panic() so that it ensures this pointer is set to some non-NULL value even if the caller didn't pass any panic string. - Modify KERNEL_PANICKED() to test for 'panicstr'. - Remove 'panicked'. 2. Annotate 'panicstr' with '__read_mostly' (instead of using '__read_frequently' as for 'panicked'). This may have to be changed if, in the future, some performance-intensive path needs to test it. 3. Convert a few more direct tests of 'panicstr' to using KERNEL_PANICKED(). Reviewed by: kib, markj, emaste Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43569 --- sys/kern/kern_shutdown.c | 15 +++++++++++---- sys/sys/kassert.h | 3 +-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 3b0e3997c852..d66c7ba0d344 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -224,8 +224,7 @@ SYSCTL_INT(_kern, OID_AUTO, kerneldump_gzlevel, CTLFLAG_RWTUN, * Variable panicstr contains argument to first call to panic; used as flag * to indicate that the kernel has already called panic. */ -const char *panicstr; -bool __read_frequently panicked; +const char *panicstr __read_mostly; int __read_mostly dumping; /* system is dumping */ int rebooting; /* system is rebooting */ @@ -899,6 +898,15 @@ vpanic(const char *fmt, va_list ap) int bootopt, newpanic; static char buf[256]; + /* + * 'fmt' must not be NULL as it is put into 'panicstr' which is then + * used as a flag to detect if the kernel has panicked. Also, although + * vsnprintf() supports a NULL 'fmt' argument, use a more informative + * message. + */ + if (fmt == NULL) + fmt = ""; + spinlock_enter(); #ifdef SMP @@ -907,7 +915,7 @@ vpanic(const char *fmt, va_list ap) * concurrently entering panic. Only the winner will proceed * further. */ - if (panicstr == NULL && !kdb_active) { + if (!KERNEL_PANICKED() && !kdb_active) { other_cpus = all_cpus; CPU_CLR(PCPU_GET(cpuid), &other_cpus); stop_cpus_hard(other_cpus); @@ -927,7 +935,6 @@ vpanic(const char *fmt, va_list ap) else { bootopt |= RB_DUMP; panicstr = fmt; - panicked = true; newpanic = 1; } diff --git a/sys/sys/kassert.h b/sys/sys/kassert.h index 7b54ac6ae519..da8701ce3858 100644 --- a/sys/sys/kassert.h +++ b/sys/sys/kassert.h @@ -35,8 +35,7 @@ #ifdef _KERNEL extern const char *panicstr; /* panic message */ -extern bool panicked; -#define KERNEL_PANICKED() __predict_false(panicked) +#define KERNEL_PANICKED() __predict_false(panicstr != NULL) /* * Trap accesses going through a pointer. Moreover if kasan is available trap From nobody Fri Jan 26 21:11:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Nc4KRjz58r2p; Fri, 26 Jan 2024 21:11: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 4TM9Nc3Yjjz4Qsf; Fri, 26 Jan 2024 21:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdmNPisAJ8u6Agmem6YdZrAZ0FLWY2wcaUfGmHCN8GI=; b=QAjkZe/EDQbapbk/BCxi5tx45v8BsLLs5RdAGc4loWy2dA4KCogwSiObVwsaMGwbxzbDlW BG6JhdrTkKo+VCAwL7HZv2WarGp0//Ag15ShtkS+ozKC3NIrxRIKIa1EE+qkzFZ6LlnjM1 faNLe+4bz4mvUcoxUFT1B9PrH6v5uNVLX8o3VmyL1Ol8kJxtdE3r9M3bH+YO0oF+UMW2mS IHUaZMY04oYfNWTKSBLcTs8KjSRYBScSs3bxNTfnhZk61Ft26Kp91g6P3GvY/v4JogqhF4 dU5TYorYhMNSAuwytB70xPsLvh3Sn0LA0nOEsONIVSZFgvmDw+qysdTLQYEUPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdmNPisAJ8u6Agmem6YdZrAZ0FLWY2wcaUfGmHCN8GI=; b=OuvQllvTREsG8cmGe3+kx14Zpnsm6ln7Lkg557teZ+zldpQ6h/nfZp7rK1sHYoSg8rYVr4 gcsWPjjah6N3Z2o3z2LkYJlqNUZX+mV3TiBuir8UUTDrgzCcKBx8Hd943fmvaik7yk+lqB KU1W99XYJhE/zeqCeurKNyRzY4HBaf5kmtPqJrsmJeuFHiXk1I3v4VKKNsOtKIswjJhJJs SHYKYJvKAFWkIp0uRdwWm/5sE1ibXoEIDi37u1nux18ARDwPbl5M+pqiJY3l33Q5EGmrpO rjn2zhAyZcqollo0SUn54RREVBktRq13rAHaNcdS5U0qMW3+tF+hO54aNM96sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303488; a=rsa-sha256; cv=none; b=WUoh9l7v0/QNG+An1SxDmp7i2qZudgccSzCk7SYypKq2G2wxaiGkHIQQQkuGH03DsUdIob T5fWRQqYS+C/6dVppYUUGqRJ3pXUzDNshE6/MSwk0h+GILS/fxl5n4QU0nJ10RwHDXFmQp Ms38rtHnNrzVt+92mRuDIjDEf/XqB1OlLK3MCQKTjvFKzlDPW4MTtX2syZfd18P7QEczfS pa1rOmm2y+SNfImr+VbumOESyM3/9znGkBkrut80dZ8rdgz7wD/3NJh4ABwOdJFt2UA7kl E0g48ieRKFXVp8GlWuUo11EEom7bDdTK54mKH7goFvjJZn2A2VnH1jiMFg8yzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Nc2cfszxXn; Fri, 26 Jan 2024 21:11: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 40QLBS3P094023; Fri, 26 Jan 2024 21:11:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QLBSaG094020; Fri, 26 Jan 2024 21:11:28 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:11:28 GMT Message-Id: <202401262111.40QLBSaG094020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 12d6a032dff1 - main - Annotate 'rebooting' with __read_mostly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12d6a032dff10fad72f7d3f1bb5cb4c53b9c4284 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=12d6a032dff10fad72f7d3f1bb5cb4c53b9c4284 commit 12d6a032dff10fad72f7d3f1bb5cb4c53b9c4284 Author: Olivier Certner AuthorDate: 2024-01-18 10:22:28 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:09:10 +0000 Annotate 'rebooting' with __read_mostly While here, put such annotation after the variable for 'dumping', since it concerns the variable and not the type. Reviewed by: markj Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43570 --- 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 d66c7ba0d344..17d40ff0429c 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -226,8 +226,8 @@ SYSCTL_INT(_kern, OID_AUTO, kerneldump_gzlevel, CTLFLAG_RWTUN, */ const char *panicstr __read_mostly; -int __read_mostly dumping; /* system is dumping */ -int rebooting; /* system is rebooting */ +int dumping __read_mostly; /* system is dumping */ +int rebooting __read_mostly; /* system is rebooting */ /* * Used to serialize between sysctl kern.shutdown.dumpdevname and list * modifications via ioctl. From nobody Fri Jan 26 21:11:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Nd5yCLz58r2v; Fri, 26 Jan 2024 21:11: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 4TM9Nd4Knpz4R1N; Fri, 26 Jan 2024 21:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LaCoiRmWJw+jZubiHdgHG3oZT4fY8IepEmdEu9sLtCM=; b=fN10aqNZeZ6LqXmi+RWvcDLHYfY9KK9nmu9cLI46ndNWgMF8hmAKd0liewRzbMWii2a5FI 0KikEpIjFF/lUpk8umEBn8asG/5QL63OarEunWgqYD0HK6gfUmX1aZe+XEL3UEUH9jtZEL fuowlrvuxSbB1zk6WjaF8dfOCT5Ibu0HPebGnpBrowz/SWV1ngLP6g526KvyT+IuVMXA7k mWvw40rberh7nUdk+A5tpryF7yl3cJgOmeE9slCxl2b56y0uIckdc6b1zK54BC4fd5BvNY m7cjsZkJRQsyNtdtniSP9y6b8JZ0C3SAGK1Wcy3rTYBd9bddJJ10Ps0RjruYTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LaCoiRmWJw+jZubiHdgHG3oZT4fY8IepEmdEu9sLtCM=; b=ZMGgVBqXUFyUbJKH1zNv7xEeIUl2rQoT3REoC3g0rk75f5I/rBzPZ4kPRBNKPrpA17BbRV VtJU0GvExASkEVIHQrbAcXq1ULQWkrZZCriGUai8hc0oQY/4EBNxIgTZjA1fnGU/i0b6L0 U/vW7J+V2meJs6/U24bLyG2w9PrGBR5CX9OiGYoBn5gDz9idOsOgq8zkieBIii+VI2SvKe 2zrAFBrGBD7Y1eWaUUK1XaVL05dHxfD8DOMkaMd/Sm5hT21h/cYnMdsr/LWprEfheTT71c AQBzxYJXmztR9NXHAAfxrGLhYbxPOMsfkvsdbgnj4dPfXETJ52wpyGrslUVEzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303489; a=rsa-sha256; cv=none; b=r0cbrnUWLx57vzFZaQOBBomE3y5ADzKgTTg6Mf23FcHXbpJNBxLfQ6HZrOu8IZn6MNifvP L3M/PBW4sj69C0i2d3ZsMCHbyRE1p9ot2lVWL45LdYyggR5tMD0H8IqsU3JTTBxZX0FdVe 1gz04K6HKiFj4NzquzJVg0QAvd7yIq1Y3/0M4zrUqerW3IT1PdnKUxzp8AGEedv3WfhdYI wtgIvDw53CUhUvtHVnCZy/V8YPH5Ba5F7N34R1wKzVE37E4b6gFi4fN2OKvOAjBVx9bwx0 +Fiq8R/iofKDKlrbv7Nzz5Lflm2tC6tktHEGe6shBaFL8AV/V9ZKBVczfwOZFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Nd3Nypzx0S; Fri, 26 Jan 2024 21:11: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 40QLBTl1094068; Fri, 26 Jan 2024 21:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QLBTYZ094065; Fri, 26 Jan 2024 21:11:29 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:11:29 GMT Message-Id: <202401262111.40QLBTYZ094065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: cd0c52e50bc1 - main - SCHEDULER_STOPPED(): Move it (back) to 'systm.h' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd0c52e50bc17f4c3fab998f9f33b1d3ada6c90e Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=cd0c52e50bc17f4c3fab998f9f33b1d3ada6c90e commit cd0c52e50bc17f4c3fab998f9f33b1d3ada6c90e Author: Olivier Certner AuthorDate: 2024-01-18 10:31:59 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:09:16 +0000 SCHEDULER_STOPPED(): Move it (back) to 'systm.h' It's not an assertion, so doesn't logically belong to 'kassert.h'. Moreover, a subsequent commit will make it rely on a variable whose declaration also belongs to 'systm.h'. Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43571 --- sys/sys/kassert.h | 11 ----------- sys/sys/systm.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/sys/kassert.h b/sys/sys/kassert.h index da8701ce3858..25e2b025a11a 100644 --- a/sys/sys/kassert.h +++ b/sys/sys/kassert.h @@ -179,17 +179,6 @@ void kassert_panic(const char *fmt, ...) __printflike(1, 2); #define CRITICAL_ASSERT(td) \ KASSERT((td)->td_critnest >= 1, ("Not in critical section")) -/* - * If we have already panic'd and this is the thread that called - * panic(), then don't block on any mutexes but silently succeed. - * Otherwise, the kernel will deadlock since the scheduler isn't - * going to run the thread that holds any lock we need. - */ -#define SCHEDULER_STOPPED_TD(td) ({ \ - MPASS((td) == curthread); \ - __predict_false((td)->td_stopsched); \ -}) -#define SCHEDULER_STOPPED() SCHEDULER_STOPPED_TD(curthread) #endif /* _KERNEL */ #endif /* _SYS_KASSERT_H_ */ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index c684f3365c35..0d3f9fe98893 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -99,6 +99,18 @@ struct ucred; #include /* curthread */ #include +/* + * If we have already panic'd and this is the thread that called + * panic(), then don't block on any mutexes but silently succeed. + * Otherwise, the kernel will deadlock since the scheduler isn't + * going to run the thread that holds any lock we need. + */ +#define SCHEDULER_STOPPED_TD(td) ({ \ + MPASS((td) == curthread); \ + __predict_false((td)->td_stopsched); \ +}) +#define SCHEDULER_STOPPED() SCHEDULER_STOPPED_TD(curthread) + extern int osreldate; extern const void *zero_region; /* address space maps to a zeroed page */ From nobody Fri Jan 26 21:11:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Ng1Pgsz58r9y; Fri, 26 Jan 2024 21:11: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 4TM9Nf5bnWz4RBt; Fri, 26 Jan 2024 21:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TrKWhsu6JaWAOUo9LmXVdEQtc3m0pTH2Au9HeuOQag=; b=L4Cv9STzQ2eIeoi4+tbFBCFYcTImjDVgP24MqzzqV7leBLc1CJO5FKmHopKvVYYJQcZ//Y BFjtD0RxMB7nfNAAm5lHGUkR3rSoOuURv69wtKHQWsFLQJLCweMnMvpKblF3r7zavvuw97 ++N7y/SIhEx+OFJrOJRyY7bL5bq/ZXb04D4hYkxnWddP7swnl+RUQ7qS5Uwsebp/485EYn Q+M8iJQtFTUS1BKEaekC+72R/lQnssN7ZUxVwkaZW3UiLXb4XlduqV8bo5a8tPz3iC0AId GFOuHy6o0NqvbmeYuqSkIMqeTBNUWfrp3j6jNq3GCWSex5j0xrx3sRAWTfb9CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706303490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TrKWhsu6JaWAOUo9LmXVdEQtc3m0pTH2Au9HeuOQag=; b=lcD7FypjRHo7fZsjwsHsJLhcr+yp/DODBkS6OZdcCotlZWW2Dp7/X8dU/nzloaWnCuEj9p 450GmDGX0jn66azPtooxQk6CwoddacATD+NYCNqG8x1NEWjbpT6U3ntdPzs4FvRH6SJHVf gFgCqtxNNMW3WkvTn80f5V6opLC8MAf5LJ/VnPpgTc/TqE0lopSxBTASDeiu6JClQK51yS DcbEKCdHZKMdf8QMgMVZwOzvjqj22slNNWEP+McW/SBhYZKg1bIwWWx3JvqfY/eLQh8uS0 VyFtUfJoLOui92GtYbrFjBbrbt84V0SsAgLNqe6Hu3rc8zE1Uim1/8aIRfYDQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706303490; a=rsa-sha256; cv=none; b=YFm1lKA38cGDsaeXsf6IeKLyOtrs4GXCTOFWpNqLAUjimysIPe/2h5Sk1IdroV5OomzOER +cKJWqs/H/CvGuHs5PCfJG28TTnzpE+MTQlkt5zE2CZQO4u67/negYLfGfOH7i/6Qai3Q9 fyX9uT+3Y2tWESQxPFmASAjuh4owVqyAWSBXyDI4e5MSBmjFNq+rH24+LzsmZJj1Qr4Hhi i+x9Yyk9npWAkmpsQSGBgwHjhT9PnkjgEcnfxT096fM007dj/rQ6kVWD8+RQb1qecDVZBJ Y2676XgjzBeGlF7Dhxa18mQPM0Eq+Z8OCeU+/nbgUCcrpuWP5n9KRnDSdY8gEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Nf4jQGzx34; Fri, 26 Jan 2024 21:11: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 40QLBUuv094115; Fri, 26 Jan 2024 21:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QLBUGw094112; Fri, 26 Jan 2024 21:11:30 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:11:30 GMT Message-Id: <202401262111.40QLBUGw094112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 6b3531017348 - main - SCHEDULER_STOPPED(): Rely on a global variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b35310173482a100304bf9129e1c9ac9e0e6d06 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6b35310173482a100304bf9129e1c9ac9e0e6d06 commit 6b35310173482a100304bf9129e1c9ac9e0e6d06 Author: Olivier Certner AuthorDate: 2024-01-18 13:10:18 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 21:09:38 +0000 SCHEDULER_STOPPED(): Rely on a global variable A commit from 2012 (5d7380f8e34f0083, r228424) introduced 'td_stopsched', on the ground that a global variable would cause all CPUs to have a copy of it in their cache, and consequently of all other variables sharing the same cache line. This is really a problem only if that cache line sees relatively frequent modifications. This was unlikely to be the case back then because nearby variables are almost never modified as well. In any case, today we have a new tool at our disposal to ensure that this variable goes into a read-mostly section containing frequently-accessed variables ('__read_frequently'). Most of the cache lines covering this section are likely to always be in every CPU cache. This makes the second reason stated in the commit message (ensuring the field is in the same cache line as some lock-related fields, since these are accessed in close proximity) moot, as well as the second order effect of requiring an additional line to be present in the cache (the one containing the new 'scheduler_stopped' boolean, see below). From a pure logical point of view, whether the scheduler is stopped is a global state and is certainly not a per-thread quality. Consequently, remove 'td_stopsched', which immediately frees a byte in 'struct thread'. Currently, the latter's size (and layout) stays unchanged, but some of the later re-orderings will probably benefit from this removal. Available bytes at the original position for 'td_stopsched' have been made explicit with the addition of the '_td_pad0' member. Store the global state in the new 'scheduler_stopped' boolean, which is annotated with '__read_frequently'. Replace uses of SCHEDULER_STOPPED_TD() with SCHEDULER_STOPPER() and remove the former as it is now unnecessary. Reviewed by: markj, kib Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43572 --- sys/kern/kern_condvar.c | 10 +++++----- sys/kern/kern_mutex.c | 4 ++-- sys/kern/kern_rwlock.c | 4 ++-- sys/kern/kern_shutdown.c | 3 ++- sys/kern/kern_sx.c | 2 +- sys/kern/kern_synch.c | 6 +++--- sys/kern/subr_kdb.c | 4 ++-- sys/sys/proc.h | 4 ++-- sys/sys/systm.h | 8 +++----- 9 files changed, 22 insertions(+), 23 deletions(-) diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c index 2731f581a29f..0d470aeafcd5 100644 --- a/sys/kern/kern_condvar.c +++ b/sys/kern/kern_condvar.c @@ -120,7 +120,7 @@ _cv_wait(struct cv *cvp, struct lock_object *lock) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, "Waiting on \"%s\"", cvp->cv_description); - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return; #ifdef KTRACE @@ -184,7 +184,7 @@ _cv_wait_unlock(struct cv *cvp, struct lock_object *lock) ("cv_wait_unlock cannot be used with Giant")); class = LOCK_CLASS(lock); - if (SCHEDULER_STOPPED_TD(td)) { + if (SCHEDULER_STOPPED()) { class->lc_unlock(lock); return; } @@ -241,7 +241,7 @@ _cv_wait_sig(struct cv *cvp, struct lock_object *lock) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, "Waiting on \"%s\"", cvp->cv_description); - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return (0); #ifdef KTRACE @@ -309,7 +309,7 @@ _cv_timedwait_sbt(struct cv *cvp, struct lock_object *lock, sbintime_t sbt, WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, "Waiting on \"%s\"", cvp->cv_description); - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return (0); #ifdef KTRACE @@ -379,7 +379,7 @@ _cv_timedwait_sig_sbt(struct cv *cvp, struct lock_object *lock, WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, "Waiting on \"%s\"", cvp->cv_description); - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return (0); #ifdef KTRACE diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 6071ac7fd6f1..92be72546b46 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -424,7 +424,7 @@ _mtx_trylock_flags_int(struct mtx *m, int opts LOCK_FILE_LINE_ARG_DEF) td = curthread; tid = (uintptr_t)td; - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return (1); KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(td), @@ -534,7 +534,7 @@ __mtx_lock_sleep(volatile uintptr_t *c, uintptr_t v) doing_lockprof = 1; #endif - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return; if (__predict_false(v == MTX_UNOWNED)) diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index 83d5862a6667..28dddb950966 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -307,7 +307,7 @@ __rw_try_wlock_int(struct rwlock *rw LOCK_FILE_LINE_ARG_DEF) td = curthread; tid = (uintptr_t)td; - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return (1); KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(td), @@ -666,7 +666,7 @@ __rw_rlock_int(struct rwlock *rw LOCK_FILE_LINE_ARG_DEF) td = curthread; - KASSERT(kdb_active != 0 || SCHEDULER_STOPPED_TD(td) || + KASSERT(kdb_active != 0 || SCHEDULER_STOPPED() || !TD_IS_IDLETHREAD(td), ("rw_rlock() by idle thread %p on rwlock %s @ %s:%d", td, rw->lock_object.lo_name, file, line)); diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 17d40ff0429c..ee666281418f 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -225,6 +225,7 @@ SYSCTL_INT(_kern, OID_AUTO, kerneldump_gzlevel, CTLFLAG_RWTUN, * to indicate that the kernel has already called panic. */ const char *panicstr __read_mostly; +bool scheduler_stopped __read_frequently; int dumping __read_mostly; /* system is dumping */ int rebooting __read_mostly; /* system is rebooting */ @@ -926,7 +927,7 @@ vpanic(const char *fmt, va_list ap) * Ensure that the scheduler is stopped while panicking, even if panic * has been entered from kdb. */ - td->td_stopsched = 1; + scheduler_stopped = true; bootopt = RB_AUTOBOOT; newpanic = 0; diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index 706ae90ef9af..d302fa45161e 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -350,7 +350,7 @@ sx_try_xlock_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) td = curthread; tid = (uintptr_t)td; - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return (1); KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(td), diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 8cb847fe2a2d..f12054a04b23 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -158,7 +158,7 @@ _sleep(const void *ident, struct lock_object *lock, int priority, else class = NULL; - if (SCHEDULER_STOPPED_TD(td)) { + if (SCHEDULER_STOPPED()) { if (lock != NULL && priority & PDROP) class->lc_unlock(lock); return (0); @@ -247,7 +247,7 @@ msleep_spin_sbt(const void *ident, struct mtx *mtx, const char *wmesg, KASSERT(ident != NULL, ("msleep_spin_sbt: NULL ident")); KASSERT(TD_IS_RUNNING(td), ("msleep_spin_sbt: curthread not running")); - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return (0); sleepq_lock(ident); @@ -511,7 +511,7 @@ mi_switch(int flags) */ if (kdb_active) kdb_switch(); - if (SCHEDULER_STOPPED_TD(td)) + if (SCHEDULER_STOPPED()) return; if (flags & SW_VOL) { td->td_ru.ru_nvcsw++; diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c index 86f392485a4b..a7fc2284cbcf 100644 --- a/sys/kern/subr_kdb.c +++ b/sys/kern/subr_kdb.c @@ -764,7 +764,7 @@ kdb_trap(int type, int code, struct trapframe *tf) CPU_CLR(PCPU_GET(cpuid), &other_cpus); stop_cpus_hard(other_cpus); #endif - curthread->td_stopsched = 1; + scheduler_stopped = true; did_stop_cpus = 1; } else did_stop_cpus = 0; @@ -801,7 +801,7 @@ kdb_trap(int type, int code, struct trapframe *tf) kdb_active--; if (did_stop_cpus) { - curthread->td_stopsched = 0; + scheduler_stopped = false; #ifdef SMP CPU_AND(&other_cpus, &other_cpus, &stopped_cpus); restart_cpus(other_cpus); diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 33a878dc46aa..b08226c89dfd 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -270,7 +270,7 @@ struct thread { const char *td_wmesg; /* (t) Reason for sleep. */ volatile u_char td_owepreempt; /* (k*) Preempt on last critical_exit */ u_char td_tsqueue; /* (t) Turnstile queue blocked on. */ - u_char td_stopsched; /* (k) Scheduler stopped. */ + u_char _td_pad0[2]; /* Available. */ int td_locks; /* (k) Debug: count of non-spin locks */ int td_rw_rlocks; /* (k) Count of rwlock read locks. */ int td_sx_slocks; /* (k) Count of sx shared locks. */ @@ -429,7 +429,7 @@ do { \ #define TD_LOCKS_INC(td) ((td)->td_locks++) #define TD_LOCKS_DEC(td) do { \ - KASSERT(SCHEDULER_STOPPED_TD(td) || (td)->td_locks > 0, \ + KASSERT(SCHEDULER_STOPPED() || (td)->td_locks > 0, \ ("Thread %p owns no locks", (td))); \ (td)->td_locks--; \ } while (0) diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 0d3f9fe98893..29c8bfc3c768 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -99,17 +99,15 @@ struct ucred; #include /* curthread */ #include +extern bool scheduler_stopped; + /* * If we have already panic'd and this is the thread that called * panic(), then don't block on any mutexes but silently succeed. * Otherwise, the kernel will deadlock since the scheduler isn't * going to run the thread that holds any lock we need. */ -#define SCHEDULER_STOPPED_TD(td) ({ \ - MPASS((td) == curthread); \ - __predict_false((td)->td_stopsched); \ -}) -#define SCHEDULER_STOPPED() SCHEDULER_STOPPED_TD(curthread) +#define SCHEDULER_STOPPED() __predict_false(scheduler_stopped) extern int osreldate; From nobody Fri Jan 26 22:28:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMC5z10vJz58yP3; Fri, 26 Jan 2024 22:28: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 4TMC5z0Vsgz4gx8; Fri, 26 Jan 2024 22:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706308135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TjsbWcrXfTkcupMAtVluHuxgM9J4pD0OKYm2C5rvRu8=; b=Q2VSO1PW72c0RgyBqRA+gDtATI6K5f2VDe5t73uRI3RvgXgO5+JxmprgujjuIMiQNuqIBV VKBWZ3BNVQ+IFDdbh9friQwTjtLo4/9+VBdw8T4FWXMab97HE3G/asl7gJqYgpO2Uy+hQf r1Y6CpBoUWkXzbLjiQlZSYyLiP/sqlVwE/xTm1FwovnWHxkHJt3/y7AzwbCHf9tR/2WtSY ura4rnkoFaZ9z87lAuOYVSBc/l/k4aVJs3ce9fMaHeUSwxebnCbE5zny6PoNH3CeyNeJD4 ty7eYaSXCH9SrTLWy/q9U3ycyUCk2xH2I/kKbB9xf1AbcYbd7qsBa8R6TrDxbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706308135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TjsbWcrXfTkcupMAtVluHuxgM9J4pD0OKYm2C5rvRu8=; b=Irm7hSUz5WTeiLMdFguzhzhVY4uQB+d0E4L8kyJ/MR/eRihMd+6diTfSymjVPM9GO4ati6 rek4zjZ7gygt3iaWlLCLzKf+44MaPE39WcPN6xRSOqEX+LL8J4wHm2VHpu71mFvZ8LODmJ og1IEV9gnY80ihI6ZEvnSv6t336jlw4b2VNjskksd4zLjP+tJqi/GWMuIK/ZKZ3Kzbs9jD B2YTN8+v9S+BG3CliX/L0uJe3saUPA8DaWEsH/ApZZC3rrdfy2/WWGmpPD54wR/X+2JloQ JQ84a/OY5ozpwaDLdaAjHFcUFYo1AwaunCkGbg1Wy7pVxeexuNUHCv7/pxHL3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706308135; a=rsa-sha256; cv=none; b=KLHch3PyW3OVA4dY33L+S3DuVEAVGOVVsGH5PE6/D9aTC3R2fHJui/Ay6Td3NGKmPmlyDz oXAWt7xZda1DmOofNmK0qbsl+KnneSCrFNL25DAfb9itUHTlhjyOUftcKz4H+t9oqUvRH3 eKPDDfdxnf8LX3rMPrE4GQGFhrMAgpRvi4oVlGtyEhtTVXagWfM3qKWVcLzyF5+xXryA67 fM5NeLnRbz0YQLeQcAXsK8/GhhYOSZzrQCwAUwnVyiY0dvlB0WrZymy3/NpVNAg0iPq64O /B55O6j/BZkGjWNlapMrmVlUIiAcx/zR5Vpm5QY34Rmz4qsw+ZXFOyFtza+6Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMC5y6gySz10NX; Fri, 26 Jan 2024 22:28:54 +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 40QMSsqw019312; Fri, 26 Jan 2024 22:28:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QMSsAu019309; Fri, 26 Jan 2024 22:28:54 GMT (envelope-from git) Date: Fri, 26 Jan 2024 22:28:54 GMT Message-Id: <202401262228.40QMSsAu019309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 176b9e0d724b - main - makefs: warn that ffs sectorsize other than 512 may not work List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 176b9e0d724b4c1a24d2c46a1256381784f04edc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=176b9e0d724b4c1a24d2c46a1256381784f04edc commit 176b9e0d724b4c1a24d2c46a1256381784f04edc Author: Ed Maste AuthorDate: 2024-01-25 01:47:36 +0000 Commit: Ed Maste CommitDate: 2024-01-26 22:27:57 +0000 makefs: warn that ffs sectorsize other than 512 may not work newfs always sets sectorsize to DEV_BSIZE (512) and derives some other values based on the number of 512-byte sectors per real sector. Similar logic is required in makefs. Until that happens, emit a warning that the image may be incorrect. PR: 276571 --- usr.sbin/makefs/ffs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 93dc2e3cd2f5..ebfda7f929e4 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -338,6 +338,9 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts) /* set FFS defaults */ if (fsopts->sectorsize == -1) fsopts->sectorsize = DFL_SECSIZE; + if (fsopts->sectorsize != DFL_SECSIZE) + warnx("sectorsize %d may produce nonfunctional image", + fsopts->sectorsize); if (ffs_opts->fsize == -1) ffs_opts->fsize = MAX(DFL_FRAGSIZE, fsopts->sectorsize); if (ffs_opts->bsize == -1) From nobody Sat Jan 27 03:09:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMKLH6RfLz57QPw; Sat, 27 Jan 2024 03:09: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 4TMKLH5xKGz574R; Sat, 27 Jan 2024 03:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706324999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ggc1/w9qM859Bfea43vO3gtYHlqWQUqU3McJcBWYNXU=; b=rE1LVu1H2tls+Gsih0LVvT/eZ8QtDDPVw075189Oohh/ldnMfHdJQZBENTlSVnfL4MZqAd IOyyxvm1+JB18w0nkMw0/C3Q8CC02EHiK9lToRAZOUaz+anOJjtDdDs+jnDhMuKFw8ui1A ABkRw2mMjBCejYW5hgW0BKTUvqUShMMWtP54FPy0neNsjHmKhEgvE79M1aSDaAe+MLfCO8 wNBEFIF5uAEXK/ztAahJYudNzXQQFN6XrOgdain6S6MdyJ25Fk6FCwNJqtUX42dDbQzu0P QXLn0Xag8den9UV/4yQ5yKs7qer3KhL4MtSVp8+hNrOSQqC+qwONjXM0VE4VcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706324999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ggc1/w9qM859Bfea43vO3gtYHlqWQUqU3McJcBWYNXU=; b=LXqjxflLNi8E2gQg89HhCkf42A7vMeTQBd3/vhEsA4aoEVJpZWNQ9f4L/5hK8WwY9VovD7 qoOoKXMyl9MeDegAOHLYnbGZgKUFpy3Z1t+UYqFiLo6AKVY7R4PZXUvroG6qn53vfFAwH/ NZajv8/DZ+QKdrAoVmibUp2qfbo0/nInS/InYH7mlTCAb4E7WcswZZNZThRk1T7NQHEj2D r5Ly1nnloaBwuIhR1Bqckdl6t8o1lIXmQDp9ElVeaDbD+lrf7xQ/kGB1lvF02HJaWObfDC Pj4ElsHlI/yYg3fo33hlA4kHILAq1SvQRBM6eaO/zyIt0lMjKD2oic6uaX+wkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706324999; a=rsa-sha256; cv=none; b=lKUnHxNoMpNimZMtBs1h1iGQt1H2EIaIQEKkno3XZxE4bjyQlgCeTaV9vfLuJUQrWGnQ+k WgqNV+tHUasbv1WJ+KfBU79pRQ5EZkOicwKkVBvGtsmep2KpKDt487R+FTWWssUi99xD4U T0WzDtJD0oHZRimACAN1oed6oB8cAQWYCfNygNwbqRh2tKllAerC3kPRmNOPauDwbJLHFk 5ebB7GUJKMt9/+tJw+jUD/WISgVHTQhEFWeBZyp3Cn9mWVz5fiJvkqzMllNrVeGXQe3/nf YFUj+0j3N1UhYPt7rI/0qiE9+XiwfvsUWnmc5EF/u8pKrRSRgaR6Trh2iRjYdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMKLH4trhz17RP; Sat, 27 Jan 2024 03:09: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 40R39xPH092410; Sat, 27 Jan 2024 03:09:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40R39xrX092407; Sat, 27 Jan 2024 03:09:59 GMT (envelope-from git) Date: Sat, 27 Jan 2024 03:09:59 GMT Message-Id: <202401270309.40R39xrX092407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 72dd306e44bc - main - releng-gce: Advertise the availability of UEFI support in GCE images. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 72dd306e44bc531fa723f4cdb631cb63cc5f09cb Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=72dd306e44bc531fa723f4cdb631cb63cc5f09cb commit 72dd306e44bc531fa723f4cdb631cb63cc5f09cb Author: Xin LI AuthorDate: 2024-01-27 03:09:39 +0000 Commit: Xin LI CommitDate: 2024-01-27 03:09:39 +0000 releng-gce: Advertise the availability of UEFI support in GCE images. The amd64 and arm64 images supported UEFI, mark it as so users can take advantage of UEFI boot on GCE. This is already done on FreeBSD 14.0-RELEASE but never codified into the release tools (and should). PR: conf/276532 Reviewed by: lwhsu MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D43557 --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index f244e6c89640..2bfdf4edc246 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -73,7 +73,7 @@ gce-do-upload-${_FS}: gs://${GCE_BUCKET}/ /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ - --guest-os-features=GVNIC \ + --guest-os-features=GVNIC,UEFI_COMPATIBLE \ --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz touch ${.OBJDIR}/${.TARGET} .endfor From nobody Sat Jan 27 09:12:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMTNJ1JNcz5838y; Sat, 27 Jan 2024 09:12: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 4TMTNH6SXwz4TX4; Sat, 27 Jan 2024 09:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LA7vX8431wamRBdO54lUROOKWcJHz4aI3FX/gpGhC9E=; b=KWPYogXTWC/TzaSTH9zu9BVE8tZQOSgeSYVlabB7SerWJtxVX2RTnsLyNLWCMypdTgjIiT dIUMwFTGcX+jWb9ihegZp4imUjTDdZ6y7UkzeJHCcajt82Jj3ogB98BuRx2/rxUE1xmFC2 PYxACJ8mGNqSqk47Rn4dpkV32iumB74tqW+fcwkC4J7O/bPIEIT6KiexrrADIK2S7W/PCA T+K11UjO2nHbdgg9Evyc0sCLrycRl9ednxlfBbzik+0+G03crcKJkVdF28D0yO1bZL/Cm7 sDJdjwWWarNVejoPW5RjMrwLKJ1bQYKTVUyoGtmL1hgOcNCRDVbhOLp8Gg0WDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LA7vX8431wamRBdO54lUROOKWcJHz4aI3FX/gpGhC9E=; b=XXlsE3x46xL5N4IKCKWu4dNlB6ab1TS9bmwDBchfJwwcy8Nu2gju055uXWD84Kd3Uvj15C iOo07X4d1kL60yYVgfetqSCeMy8ME0CASNl18AZuzwY8cAf15uGM9dZY+ME5HdycQKBJPX SSQ+plKiUq3ETFxiq/vQrYP71wo9ImIxTMzN77fB9H4SgAbxSXxCIDFOPHFmietGVT0g1Q os5s/ebcAS2wA0gENkRqyOZyGrgE6yC241wr+gndbGI4sLVf9fA4sKhUXJPGcHjGqgb/Rh I22vtrT2rtKGqICesOMUqISi+1qiCQuknZLOfdQBT39ViqrEnToTVahs0kizdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706346735; a=rsa-sha256; cv=none; b=oCvTDMH7VqqDOR159epyEVZiK3muk9UfBxGrNmQTS5En02LtNuJ8FcUiWLoF4FIF6zF2/s Kej7rkZrPDuBfcC4gukOhICdHoiWnMD5pRVE6Mle11MXvTAnv1LFoFAF6+lOblrZh8/bsU GMhHmJvZJDY/DQDzlZHvaPBfzzTjyI/VMxCJemiZq8txVwYcmQ1Tibx2PkhGqO87NG1Xwb e5IF9tZwzxNyY8/7DpqVKFXUd93LmqogfnH6ooxZzK1/wUsdWKgWn5ttFziuY9O9pJLy3y 2tzhQBlD0dsc4NkVpJFTA3JTcx0P0a6nKq7YoLwu3HQXDygJr/AWZHqcPi+/Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMTNH5ZF6zJqB; Sat, 27 Jan 2024 09:12:15 +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 40R9CFQc012397; Sat, 27 Jan 2024 09:12:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40R9CFYf012394; Sat, 27 Jan 2024 09:12:15 GMT (envelope-from git) Date: Sat, 27 Jan 2024 09:12:15 GMT Message-Id: <202401270912.40R9CFYf012394@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: 63a7e799b32c - stable/14 - fsck_msdosfs: do not call checksize() if the cluster is bad List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 63a7e799b32cd9a5dcc3158677330edf8ea313bb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=63a7e799b32cd9a5dcc3158677330edf8ea313bb commit 63a7e799b32cd9a5dcc3158677330edf8ea313bb Author: John F. Carr AuthorDate: 2024-01-20 23:18:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-27 09:11:31 +0000 fsck_msdosfs: do not call checksize() if the cluster is bad PR: 276464 (cherry picked from commit deeb1d34024b3f843d965cdf204c745165c9bac0) --- sbin/fsck_msdosfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index c60eaab59b12..19516d882e2a 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -995,7 +995,7 @@ readDosDirSection(struct fat_descriptor *fat, struct dosDirEntry *dir) n->next = pendingDirectories; n->dir = d; pendingDirectories = n; - } else { + } else if (!(mod & FSERROR)) { mod |= k = checksize(fat, p, &dirent); if (k & FSDIRMOD) mod |= THISMOD; From nobody Sat Jan 27 09:13:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMTPB3SMpz58304; Sat, 27 Jan 2024 09:13: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 4TMTPB2Zyxz4V67; Sat, 27 Jan 2024 09:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ntrk9UF1CJ4swPIesuCZFudTqmWnBERSsYp+lMX8XI=; b=AQMERDFLAwcawaCsgeOf9vCe6bANHtFuXZmLuio+K33c6aRe5Zouk1FV53cWTtRvcKULps Suj1ZKpGmf4Kj5eFrGVKk7biSmEotX2O10i0iMXmqSnQGjByD9ygY8P5iZDZlxJ9Nx3zEf nd8Kf2nMSKTJt3/wNxEXeXxkHDNOQXiuYB7ee7T+iSs7Fe6ExPc9FiUawF/KflCFd4p5ba S06p7ryjB8JlYY92Nx9nLHx8CqblwjkSMxonC0Fq8ZmbHfeSCYzKkbhwDUEsb+5HTw958P 4T0fGuR1ivpImlYfM/W0QBaBP0nOsurRdabeJ91eLu/jyqHRlKzZNycSFWprLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706346782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ntrk9UF1CJ4swPIesuCZFudTqmWnBERSsYp+lMX8XI=; b=J1ZW6oKCWDR2Hw3/19fSfgO1EJIcWkEAAGpu1CTS9U4WGpyiUqWhrEl0clwalA2YumZqnX Gg0aXFtAcjLTLGI7fho/0cmpC6z2DCLpHu20GeboCYX5BfwggSbtE+EmRRx2O9FdzemcO2 x8siKJeKiazCCNzmTkbNdYjpneXrJ3j4/5tz8MtOLnUs6nv1MvYy6JJQedZ/NBfEph1SgA br1NztZp7yrB+vrc2ZOHxiQf7HsYVpqBM1BGQH94ky3fltuzVHng8TgRJuDXF5E/3GfOl2 6r9RiQ7vDTIpnZXyj+DIl/hkfpFq3yScX140JjmuFumgUUq52hoN4fLIsZhBLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706346782; a=rsa-sha256; cv=none; b=Wsj4VabqSJGnThx4zpAnDGf4ATA1eqX8z9VtUif1QBZb6l0tWxwCUPr+JBv9cagu9+N1i9 6R/VAHwZ1Zqmb5mt/N9KxSH2KAl6D4Djkl3isg8N8qL3tJjSF2LI7eFLktEkGJdRJjO7+Z Opl17VCoP2WtMpXtWYrbV3st7OuGLwCY6UVJVVm6DeBVvhJp+wIdM5dCFAyjL6yMwvYYLC UGHGwPZtHoT9WaTWiVq25Pm4weiDO6PuF5ZH9EYEneilRftzDV10cXJri44dImKsgBdeKE zBwxDpR/cqnHTuv9gYRS07cBf9Dvrqljf3E7vUjA2B6zDQOXFaYwtakzxIwMhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMTPB1f0BzJnk; Sat, 27 Jan 2024 09:13: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 40R9D25Z012633; Sat, 27 Jan 2024 09:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40R9D29e012630; Sat, 27 Jan 2024 09:13:02 GMT (envelope-from git) Date: Sat, 27 Jan 2024 09:13:02 GMT Message-Id: <202401270913.40R9D29e012630@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: 3ed143596029 - stable/13 - fsck_msdosfs: do not call checksize() if the cluster is bad List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 3ed143596029f4605354715c150381f2bbbc795f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3ed143596029f4605354715c150381f2bbbc795f commit 3ed143596029f4605354715c150381f2bbbc795f Author: John F. Carr AuthorDate: 2024-01-20 23:18:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-27 09:12:26 +0000 fsck_msdosfs: do not call checksize() if the cluster is bad PR: 276464 (cherry picked from commit deeb1d34024b3f843d965cdf204c745165c9bac0) --- sbin/fsck_msdosfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index be3d5ddc5425..fbd1929f17f4 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -982,7 +982,7 @@ readDosDirSection(struct fat_descriptor *fat, struct dosDirEntry *dir) n->next = pendingDirectories; n->dir = d; pendingDirectories = n; - } else { + } else if (!(mod & FSERROR)) { mod |= k = checksize(fat, p, &dirent); if (k & FSDIRMOD) mod |= THISMOD; From nobody Sat Jan 27 15:40:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMf064cfwz58R4h; Sat, 27 Jan 2024 15:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TMf063mLNz4PFk; Sat, 27 Jan 2024 15:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706370022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b8CEYXfFPIc44+WXizSUhVMz/dHa5i+rBWY+YfNkKLY=; b=G2kr2uQNlDQuLWHmQLHWCkh83UPvhlXff+Ftau2y10QU9lllbTTiENQ6K1lMhpOhpK5+i2 y1PNo6zNlY68RsXs/zOXr2IYVjgbZngF61fgCDgi1MMow2MBoNBAe1uqH9bwIUT8zQNpHk ZSdORL4SsjgWGr9E7SyvtFu+HCHC/TSmBt5UWbHdNcjPNq3E70HT1yzYNNG0D7HpamZL72 HaNVz/QSYIZ9cMml5qg7w45ecesSegpyQ1RXsYfixrYikWPYpOEnV1fRUul4huJwpHGatv FcXaPLdRnZLh39oH8z6HmX2abhOaLhbAhFyUjC8mL7c6bZVcrfKXdQp+NkRAQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706370022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b8CEYXfFPIc44+WXizSUhVMz/dHa5i+rBWY+YfNkKLY=; b=syVdojf++7U8ymtNS9nUe0XBJd+Dr/JPhO5i5/BFSzv6g/9x3BvEWByAEJZ+MI7BJVXXlh SsnkfMwRx/Ty++WklSeSPsL9zYXRvnDcnM/sy5YKDR+FqdM1tAvQKjdTVbnCDLftIVQFce BwAQecq7ZGWeZWh/gEPoTKahP9bfbL4XRZ/ugjKsREcDpSty7AGZVDwr6AiPhinSxRnSfN PX3sA14o7Nd5GMGiQFy+cwfNei093FGowvASquSedyakUcQbY0YHkEUSiiSDFUwtsgHMtj h3RNkxl13j+p9UGsC6M3A0rtL48iijsKhK8BguxYTxHlQE/5OIk852ENcbA9rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706370022; a=rsa-sha256; cv=none; b=EtPmrsUlIPPMxkXEi/flglfaGcI3HnlUfxGojYeDiroqrf6zG4TEdWCd0FtlF6Zycm0v2q YamhNqRzWOnU+1SsGU9VgN8ZtzFVP+ZTOsa7i+Rf2BKo6utmdp4TyqKfU5URFEVnHgID/L qwHejk8poBaXRbhUdEeNsXzJulQAGinKIHcUwCAZsHA2VQkT147iphmSEqihk6p2bwg66O fdVPoNwbA6cRZsU39M4zszT0YPdSuh7IAIIi5KnBs3tIAHytzmPkkixi5tfqlVjcZDe2mg f+h5tD7jFEEuQesoz2jbea32XgtYXgHGLC65mNkJuzkozhK4R0Ga1Rl2HYtLTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMf062p84zTcM; Sat, 27 Jan 2024 15:40:22 +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 40RFeMuu062682; Sat, 27 Jan 2024 15:40:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RFeMd4062679; Sat, 27 Jan 2024 15:40:22 GMT (envelope-from git) Date: Sat, 27 Jan 2024 15:40:22 GMT Message-Id: <202401271540.40RFeMd4062679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 9231c42127bf - main - inet(3): clarify syntax accepted by inet_pton List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 9231c42127bf8e47588169ecc395f57cae0e15fb Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=9231c42127bf8e47588169ecc395f57cae0e15fb commit 9231c42127bf8e47588169ecc395f57cae0e15fb Author: Mike Karels AuthorDate: 2024-01-27 15:40:07 +0000 Commit: Mike Karels CommitDate: 2024-01-27 15:40:07 +0000 inet(3): clarify syntax accepted by inet_pton The section INTERNET ADDRESSES describes the acceptance of dotted values with varying number of parts in multiple bases. This applies to inet_aton and inet_addr, but not to inet_pton. Clarify this section by listing the functions to which this applies. Move the description of what inet_pton accepts into this section from STANDARDS, where it is easily missed. Rename the section to clarify that it applies only to IPv4. (inet_pton also works with IPv6.) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43537 --- lib/libc/net/inet.3 | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3 index 5e8c1953431b..7b1a5fcc8ede 100644 --- a/lib/libc/net/inet.3 +++ b/lib/libc/net/inet.3 @@ -173,10 +173,15 @@ All Internet addresses are returned in network order (bytes ordered from left to right). All network numbers and local address parts are returned as machine byte order integer values. -.Sh INTERNET ADDRESSES -Values specified using the +.Sh INTERNET ADDRESSES (IP VERSION 4) +The +.Fn inet_aton +and +.Fn inet_addr +functions accept IPv4 +values specified using the .Ql .\& -notation take one +notation in one of the following forms: .Bd -literal -offset indent a.b.c.d @@ -210,6 +215,13 @@ may be decimal, octal, or hexadecimal, as specified in the C language (i.e., a leading 0x or 0X implies hexadecimal; otherwise, a leading 0 implies octal; otherwise, the number is interpreted as decimal). +.Pp +Note that +.Fn inet_pton +does not accept 1-, 2-, or 3-part dotted addresses; all four parts +must be specified and are interpreted only as decimal values. +This is a narrower input set than that accepted by +.Fn inet_aton . .Sh DIAGNOSTICS The constant .Dv INADDR_NONE @@ -256,12 +268,6 @@ and .Fn inet_pton functions conform to .St -xns5.2 . -Note that -.Fn inet_pton -does not accept 1-, 2-, or 3-part dotted addresses; all four parts -must be specified and are interpreted only as decimal values. -This is a narrower input set than that accepted by -.Fn inet_aton . .Sh HISTORY These functions appeared in From nobody Sat Jan 27 18:49:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMk9w04c2z58jq6; Sat, 27 Jan 2024 18:49: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 4TMk9v6cdKz4lMW; Sat, 27 Jan 2024 18:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzMMHJyceWFi2UN1QJObZNXbnlb5H2kiXYr9lEO3Qrg=; b=sfbr1I40WgThvlOsTBVL0wCoXjcK2onbEiZlkGEXXQQRin3PYZDQbGzGZ1Y5lzctc9QJkC fXiBzk8Aoy566ct0Pmyhxey030FG3hs8DMePi0jzJdWeqJHaL1aWfsoPpT+PlsIXIQDWEB UBWnbTxFF29/4lS6AcwRs2h8uysGQex+exvMCd3USgUVg9DVa1B7xnrvA7fSFbgclXWyyV iadTZDx6rcY+5JXt8SQA0cLX3APfwoNy3V4/6nLkpo8B1M4BIL/xIjcmNP9TMla815NyEO CLknkBitoD2s8RduzeJ/fxxo+1gPydXzuDI5d3t/c6TGOwjdUJX33gDnQ1PS2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dzMMHJyceWFi2UN1QJObZNXbnlb5H2kiXYr9lEO3Qrg=; b=IEo/BeBJwDy7vVSAA+Y9Bu6VXqE2ypKyMSrny+nbF/MyKCxFse5IvunQeLfcg63srqq8OQ M+qsu9wndvF6zvX+RZIo+Yyq1EsdxS6K/M4y3D1UTI5cmoF90mqLi/RKGZi3+O5yDrynOM GWC0kOm2QuMBGbgg+8qFpV5pRZBNmZkyKVCQ5ZBrfUUNrMDCMCkRXGu9ynKTnw8wfP7894 GasXkLOYnTwS70EcLVemjqP76X0Wlz0gh5hdJmoFOfqiKEHxh6kWjDM1yAdROd1ueJsT4j zY6l4og/DB3Sa883kx9mIWUl7v4/8hypQsJgGNV8TP6TdsTC5bOfkWnD4H9vsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706381347; a=rsa-sha256; cv=none; b=d4CYk3AH92vXFc9MOl244It1aD/uLjsKQeh9b/Q+oqW0/sa6hgcOoznsv1/xR55ZnYs41y P09+dFYt4fUMUtn2p5ltPmvmOGqbARY1BTLjsQ+HnHt5uZ3tbQlegSPY+JFhv93w2iOIXt JoctPellJvVQ6IgI6dXjA043gEXXoPgqr+IcZBL/wAoZGUrF5B/qEnyB6UvRSCB0jgGU6g kogB/EayY10JepCUsthjZv7V9iFNXyebn08sgu1zagUJDONnbAtYPTMn6yT09+bpvR4PpY SwOuXzPtHwcbiSHgFPUOTEfxiQXwkN5Q5tIXlSMUC+o2DouJ83Ji0NE3sqJCgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMk9v5gKjzcMc; Sat, 27 Jan 2024 18:49:07 +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 40RIn7Er073987; Sat, 27 Jan 2024 18:49:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIn7Na073984; Sat, 27 Jan 2024 18:49:07 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:49:07 GMT Message-Id: <202401271849.40RIn7Na073984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 00a82bd964b6 - stable/13 - hv_kbd: Fix build with EVDEV_SUPPORT kernel option disabled. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 00a82bd964b68ad20f47b25f9419af14ff159f64 Auto-Submitted: auto-generated The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=00a82bd964b68ad20f47b25f9419af14ff159f64 commit 00a82bd964b68ad20f47b25f9419af14ff159f64 Author: Vladimir Kondratyev AuthorDate: 2021-04-22 22:13:25 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-01-27 18:46:46 +0000 hv_kbd: Fix build with EVDEV_SUPPORT kernel option disabled. Reported by: olivier PR: 268653 (cherry picked from commit 55eb41bb1fb69429330ea415fb463735ae08da64) --- sys/dev/hyperv/input/hv_kbd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/hyperv/input/hv_kbd.c b/sys/dev/hyperv/input/hv_kbd.c index 82d661faedb9..3f8fe3c30154 100644 --- a/sys/dev/hyperv/input/hv_kbd.c +++ b/sys/dev/hyperv/input/hv_kbd.c @@ -267,9 +267,8 @@ hvkbd_read_char_locked(keyboard_t *kbd, int wait) uint32_t action; keystroke ks; hv_kbd_sc *sc = kbd->kb_data; -#ifdef EVDEV_SUPPORT int keycode; -#endif + HVKBD_LOCK_ASSERT(); if (!KBD_IS_ACTIVE(kbd) || !hv_kbd_prod_is_ready(sc)) From nobody Sat Jan 27 18:52:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMkFb2n7Qz58jfT; Sat, 27 Jan 2024 18:52: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 4TMkFb2Lmpz4m1R; Sat, 27 Jan 2024 18:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fRuwZnz5OQn2e3VUlH1P/kJNCLLaIaj1Wa+fVuR6N00=; b=axm2VxkhsNcK2dqnw61XD1BeC5LIyvMbfbAglnm/MzwnohJQewV5QGgpr9I98Wq5Tn4g34 RiLbmsopq1cHCVvN2dyPrktqVSEmXqyLZ/JS+VQSdjWUoFybUKBi5OjpXt1t3gKVxBjPHz UU1e2UgRdsgVPTDF3NKcRimZ2gPwnH5B1YPoW2AsJoaxnPU5knkYPid1jLCr+nwhHN5sDz 19/RptaP3gg1JLY6B9m7spWj3/61RM6hpciq0BzCychZ+5VtBl83tI3m+WbdWTolh9bF+r rFpMWDuOXyLlo/2NxIIHEZL7bJcYdNpxANg4h4DK1xtN5IymZm7VQ5d/1twynA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fRuwZnz5OQn2e3VUlH1P/kJNCLLaIaj1Wa+fVuR6N00=; b=QO/dgzlEEyU/yr48tIO+8Bsfq1L51tXReXmhgHfJU8D/vl9sVMvIkEzS0tLWO72NOkiPz0 ii8rtmi2Vm2If+6ObP6pbPWh8wtkwtufeUpaeYxaSmntRu1uj83L0AQDE82r6Bu+9hFtVU Jz2CWwiiMMx3XprV2KkW49LoyZ6JXOsqlSQIGcHQ6nxoWz15eiW1NYwkCAzKLWQBDl+bhB rDcsK5G6MjLodieCKkea1hXLAo/PhYk0RABD5HibMoHK9TlFgAnDwfOJNFumG/WVDF8Rs1 rC3CHysw2emmfIBMRcv/bo5cmHYBRu/AZRhCAIpF3uQ3G2UMumbsdVEG3Fcd8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706381539; a=rsa-sha256; cv=none; b=D2J22nc1mFLS1U+vanx1gYasoZJEZmOC0JDZHpnnsabblYmrk9YfsKwpRM4EBbKUqeBfk9 HtXdEk2EHfVPpaXtQ+qXY/enAQDo0JYTG17gP9DdlcG57dgqODqdYwSl8mHqZFYk0eDpKT HQLliH+/vEgPB2Tadj97PpZnq2QnEx2/XLGuWN7JUGH7fR91YcE2XcVe0mBKE9/cy6e5qE iLPjNj7yK+EKXtI9Zw8v3qDz45GkpcdhrtBvLL263aNg4Mmtpfo6aqbsmmVZUCrW8faRqT 2jim3BrggTNjnp2aIbSKdeJpZkMyR2veU2gIfsQgcR4XEDzOqemzNcsW4NyX3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMkFb1QbDzcN3; Sat, 27 Jan 2024 18:52: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 40RIqJJK088697; Sat, 27 Jan 2024 18:52:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIqJ4j088694; Sat, 27 Jan 2024 18:52:19 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:52:19 GMT Message-Id: <202401271852.40RIqJ4j088694@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f5463265955b - main - kqueue tests: Add a regression test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5463265955b829775bbb32e1fd0bc11dafc36ce Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f5463265955b829775bbb32e1fd0bc11dafc36ce commit f5463265955b829775bbb32e1fd0bc11dafc36ce Author: Mark Johnston AuthorDate: 2023-11-24 15:28:13 +0000 Commit: Mark Johnston CommitDate: 2024-01-27 18:51:13 +0000 kqueue tests: Add a regression test Based on the test case submitted by Andreas Bock for PR 275286. PR: 275286 MFC after: 2 weeks --- tests/sys/kqueue/Makefile | 4 +- tests/sys/kqueue/kqueue_fork.c | 89 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/tests/sys/kqueue/Makefile b/tests/sys/kqueue/Makefile index 3267b9ad8d9a..37f4f323904d 100644 --- a/tests/sys/kqueue/Makefile +++ b/tests/sys/kqueue/Makefile @@ -1,10 +1,10 @@ - TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel/kqueue TESTSDIR= ${TESTSBASE}/sys/kqueue BINDIR= ${TESTSDIR} -ATF_TESTS_C+= kqueue_peek_signal +ATF_TESTS_C+= kqueue_fork \ + kqueue_peek_signal NETBSD_ATF_TESTS_C= proc1_test # XXX: fails `ke.fflags & NOTE_TRACKERR` invariant diff --git a/tests/sys/kqueue/kqueue_fork.c b/tests/sys/kqueue/kqueue_fork.c new file mode 100644 index 000000000000..e4c0412c1980 --- /dev/null +++ b/tests/sys/kqueue/kqueue_fork.c @@ -0,0 +1,89 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Andreas Bock + * Copyright (c) 2023 Mark Johnston + * + * 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. + */ + +#include +#include + +#include +#include +#include + +#include + +/* + * A regression test for bugzilla 275286. + */ +ATF_TC_WITHOUT_HEAD(shared_table_filt_sig); +ATF_TC_BODY(shared_table_filt_sig, tc) +{ + struct sigaction sa; + pid_t pid; + int error, status; + + sa.sa_handler = SIG_IGN; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + error = sigaction(SIGINT, &sa, NULL); + ATF_REQUIRE(error == 0); + + pid = rfork(RFPROC); + ATF_REQUIRE(pid != -1); + if (pid == 0) { + struct kevent ev; + int kq; + + kq = kqueue(); + if (kq < 0) + err(1, "kqueue"); + EV_SET(&ev, SIGINT, EVFILT_SIGNAL, EV_ADD | EV_ENABLE, 0, 0, + NULL); + if (kevent(kq, &ev, 1, NULL, 0, NULL) < 0) + err(2, "kevent"); + if (kevent(kq, NULL, 0, &ev, 1, NULL) < 0) + err(3, "kevent"); + _exit(0); + } + + /* Wait for the child to block in kevent(). */ + usleep(100000); + + error = kill(pid, SIGINT); + ATF_REQUIRE(error == 0); + + error = waitpid(pid, &status, 0); + ATF_REQUIRE(error != -1); + ATF_REQUIRE(WIFEXITED(status)); + ATF_REQUIRE_EQ(WEXITSTATUS(status), 0); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, shared_table_filt_sig); + + return (atf_no_error()); +} From nobody Sat Jan 27 18:52:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMkFc4RGZz58kCX; Sat, 27 Jan 2024 18:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TMkFc2mkVz4lxn; Sat, 27 Jan 2024 18:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RNVMBTbVrJEaAv2VI4QaCpwXt5KD2UgtQlIxSKmKBk0=; b=BtyiaS30I5jDcczEjLZ25j6ADs7+vsWnfzxGs0RIN8boFqxGid/xpWA+7UhKDUBELkWTrE D4367X4PyZch9qiyGQlerYZAdq8cHl6IkqSQyKAtHrK3sQZkCx0BqX47tWU4vppz5Q/vyO rOl3Ubgwwc8oMrkg/W3eXH/QVmoLfSLe5veeLS86kdYNubUWKJznqWv+NjbYvZ2RIHT8hL UTvt4wgoeH4OKGOyTE75mljjWzgnDO8EKDSpe/jhUmfT/eVwLDnT2UZkqH9/1RNJzbw3Ir 41XCesjJBgj/hXAg645+4tH3LDrdz+Xt52V/XBnR6AyvvG2jRj/f1H2ulvMTeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RNVMBTbVrJEaAv2VI4QaCpwXt5KD2UgtQlIxSKmKBk0=; b=J1oyecfu6hSu2sPDnagiEQOyzB+lzhmMnTM56Qw8/JkAGT+djF2ZNeWz2+v5Q677XNAr4w epmAxMIOYKxX5mrJYws81VPum4CNPXJ6WfMbzoIecihV8bgA5ePG11cvhkWRDU6OabAeiR 3WPY0AOSNDSyTWzvPA1YQgAcorU3Hm9OTujJL/XG0daj5QS9KgTuiNFYC8FxtZvNfmb1ro kG58pAuW8tXM+QEETTyWz03Ry1RECvJO0mQ0TmcZy0c+xq7P0y5E+CcqhnUQLYfCexGG38 93/nTaqSyb9MfnU8kSGVTrIgkw+QFE8lgJ1uN0p1Ruazr9ypba7gSJFhG5Hw6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706381540; a=rsa-sha256; cv=none; b=lIXh2Uy4bpa59yNPKFVllv8LkQXx5BewHtlogAA8s3UdNLIBCs+eJd7Bl5ZB90YH9VJqs1 zM2sL5LlFpqSz4/LjjRQbqS7oZI0EBY11Y7M8cZ/nVCl6wd4Kf2i4qBppe7kUKfEE/EUgI /454TzLTJUcCC2uvisLlSlCBOHarUIGKspoKZatKFeSgOyA5DP3a8vMgi3T6OhDM8wDX/W uMSFYB9di87Dc6C75AjqqflW3jkxZbCK/HyP0XhgNYF1C+tclhbpbj6wisWyydPX9elT0Q JqdHK8zV/ZWWtQ6liuSpyJStgPhL4yBMRFV4IbcXXVW7UuCM2DGA4olXOuz3LA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMkFc1rF1zcN4; Sat, 27 Jan 2024 18:52:20 +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 40RIqKCi088777; Sat, 27 Jan 2024 18:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIqKVW088771; Sat, 27 Jan 2024 18:52:20 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:52:20 GMT Message-Id: <202401271852.40RIqKVW088771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bbf86c65d04d - main - netinet: Remove stale references to Giant from comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbf86c65d04d6013fd3f7b6d74a341256c4e7336 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bbf86c65d04d6013fd3f7b6d74a341256c4e7336 commit bbf86c65d04d6013fd3f7b6d74a341256c4e7336 Author: Mark Johnston AuthorDate: 2023-03-12 18:59:42 +0000 Commit: Mark Johnston CommitDate: 2024-01-27 18:51:13 +0000 netinet: Remove stale references to Giant from comments MFC after: 1 week --- sys/netinet/igmp.c | 2 -- sys/netinet/in_mcast.c | 15 +++++---------- sys/netinet6/in6_mcast.c | 7 ++----- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 1655963e6cff..454668c2aadc 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -166,7 +166,6 @@ static const struct netisr_handler igmp_nh = { * Any may be taken independently; if any are held at the same * time, the above lock order must be followed. * * All output is delegated to the netisr. - * Now that Giant has been eliminated, the netisr may be inlined. * * IN_MULTI_LIST_LOCK covers in_multi. * * IGMP_LOCK covers igmp_ifsoftc and any global variables in this file, * including the output queue. @@ -1672,7 +1671,6 @@ igmp_fasttimo(void *arg __unused) /* * Fast timeout handler (per-vnet). - * Sends are shuffled off to a netisr to deal with Giant. * * VIMAGE: Assume caller has set up our curvnet. */ diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index 6d68ebcb188c..f5b20c49ffd2 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -92,8 +92,8 @@ static MALLOC_DEFINE(M_IPMSOURCE, "ip_msource", /* * Locking: * - * - Lock order is: Giant, IN_MULTI_LOCK, INP_WLOCK, - * IN_MULTI_LIST_LOCK, IGMP_LOCK, IF_ADDR_LOCK. + * - Lock order is: IN_MULTI_LOCK, INP_WLOCK, IN_MULTI_LIST_LOCK, IGMP_LOCK, + * IF_ADDR_LOCK. * - The IF_ADDR_LOCK is implicitly taken by inm_lookup() earlier, however * it can be taken by code in net/if.c also. * - ip_moptions and in_mfilter are covered by the INP_WLOCK. @@ -1186,9 +1186,9 @@ inm_purge(struct in_multi *inm) /* * Join a multicast group; unlocked entry point. * - * SMPng: XXX: in_joingroup() is called from in_control() when Giant - * is not held. Fortunately, ifp is unlikely to have been detached - * at this point, so we assume it's OK to recurse. + * SMPng: XXX: in_joingroup() is called from in_control(). Fortunately, + * ifp is unlikely to have been detached at this point, so we assume + * it's OK to recurse. */ int in_joingroup(struct ifnet *ifp, const struct in_addr *gina, @@ -1362,8 +1362,6 @@ in_leavegroup_locked(struct in_multi *inm, /*const*/ struct in_mfilter *imf) * The delta-based API applies only to exclusive-mode memberships. * An IGMP downcall will be performed. * - * SMPng: NOTE: Must take Giant as a join may create a new ifma. - * * Return 0 if successful, otherwise return an appropriate error code. */ static int @@ -1550,7 +1548,6 @@ out_inp_locked: * Given an inpcb, return its multicast options structure pointer. Accepts * an unlocked inpcb pointer, but will return it locked. May sleep. * - * SMPng: NOTE: Potentially calls malloc(M_WAITOK) with Giant held. * SMPng: NOTE: Returns with the INP write lock held. */ static struct ip_moptions * @@ -2520,8 +2517,6 @@ inp_set_multicast_if(struct inpcb *inp, struct sockopt *sopt) /* * Atomically set source filters on a socket for an IPv4 multicast group. - * - * SMPng: NOTE: Potentially calls malloc(M_WAITOK) with Giant held. */ static int inp_set_source_filters(struct inpcb *inp, struct sockopt *sopt) diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c index db2176614f38..a6186568ecb2 100644 --- a/sys/netinet6/in6_mcast.c +++ b/sys/netinet6/in6_mcast.c @@ -101,8 +101,8 @@ RB_GENERATE(ip6_msource_tree, ip6_msource, im6s_link, ip6_msource_cmp); /* * Locking: - * - Lock order is: Giant, IN6_MULTI_LOCK, INP_WLOCK, - * IN6_MULTI_LIST_LOCK, MLD_LOCK, IF_ADDR_LOCK. + * - Lock order is: IN6_MULTI_LOCK, INP_WLOCK, IN6_MULTI_LIST_LOCK, MLD_LOCK, + * IF_ADDR_LOCK. * - The IF_ADDR_LOCK is implicitly taken by in6m_lookup() earlier, however * it can be taken by code in net/if.c also. * - ip6_moptions and in6_mfilter are covered by the INP_WLOCK. @@ -1418,8 +1418,6 @@ in6_leavegroup_locked(struct in6_multi *inm, /*const*/ struct in6_mfilter *imf) * The delta-based API applies only to exclusive-mode memberships. * An MLD downcall will be performed. * - * SMPng: NOTE: Must take Giant as a join may create a new ifma. - * * Return 0 if successful, otherwise return an appropriate error code. */ static int @@ -1581,7 +1579,6 @@ out_in6p_locked: * Given an inpcb, return its multicast options structure pointer. Accepts * an unlocked inpcb pointer, but will return it locked. May sleep. * - * SMPng: NOTE: Potentially calls malloc(M_WAITOK) with Giant held. * SMPng: NOTE: Returns with the INP write lock held. */ static struct ip6_moptions * From nobody Sat Jan 27 18:52:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMkFd6Cw9z58jtJ; Sat, 27 Jan 2024 18:52: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 4TMkFd42r4z4mBf; Sat, 27 Jan 2024 18:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pI8CkwYmknH/gtQl04TJaBLG5Yv+vs3fgyBDADR6WdU=; b=bt+qIQwyIyoRxT1qBCZ7yQ3NOJMoPnk51kmmNXgqVTydSfFb1ghmtXNOeP/FuN4Xvuagvr tOfkPZ1YeBL3J8aB27DwDaFDOfXm1yi02qvuBFGUeNA3HM7AndFddZobulTxF0n1PFaoE5 T40uCEfqFNH0l0hYM6xNciQAaorCVkg5n1sc0iSTzvLdzHI12nBlu4guZOqh0RmoEcTexp u2Ne8Dok3JKyuAtiBItvX+rQz/OuzdNhE0yjK/uT7fdkoRd7WDD8c4hAGLwU0uuUtMUONP hFjtG/ChdxXQ+gJyip7ywqM5rZ8yOCjyb/0BQEfF2lDI/hJYBeS+OA5FnWU7NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pI8CkwYmknH/gtQl04TJaBLG5Yv+vs3fgyBDADR6WdU=; b=Z4mNqUX/rv6APNBLZ1mDrvdaUpBDmgbRCtTVV7FO8UE/kd3SMD0GPsf8O/W3XhiLenKkuY FAT+jRw3cRAmoctXOlcV10KvIjq7+o0Sl7eMOaqBqE9wl6lTIhpHNvF90n0wHPyvWAWH72 MpajqGWqjWcbDOJA1VleZloZtEk6ICLhZQqLuFopEsr+Z1efpbYdIsZYVqSkiIXr23TQ8L FilYIewkUP6Uakr722OP/Z47gpiXj+jd/UY8sXh3wGAOM4lH4oEPaJa8fdRn/f65oEK0pE 1IZWglypicMBDR0aGKrbQDC+nQQpxPoR2dUpetIi+MOiVh52XHR6dG+ygFF45w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706381541; a=rsa-sha256; cv=none; b=Z6RKCsz0L8n524BiLjpJnJHT1DMuNJYj+tgGkmh9oip1ejJaXj7FfvGy5gXO5LfNfNk72D JGgj9CEfCj/Gvp0a2AnMfwv0pRkKyZR7jP5bGvkLmnBR9bKBoWvqYi/TvkGbgAEVWdczd0 cXpmAwyrcomcOcgzJT1FyIb32vz8nneKrhZqq6QAq1o4l/MRcPGSRUX80N1Ou+FAQERNXW 38jsiugj2+GrDHtbwgLsS2lK+sJc+rGeNandzEYEoI/VKovMTH1tmPcNfNlMZIegc3CyPP f4CcZAIY+WM0L3cFqeUSARxqLXDR7GWPI+bQgEUOoLW3fUHn0fHEOPZ+ZxZGNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMkFd34t9zcDk; Sat, 27 Jan 2024 18:52: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 40RIqL4c089804; Sat, 27 Jan 2024 18:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIqLdg089801; Sat, 27 Jan 2024 18:52:21 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:52:21 GMT Message-Id: <202401271852.40RIqLdg089801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2e55256de3e6 - main - route tests: Serialize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e55256de3e6193b5073f9774362b06ce690e482 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2e55256de3e6193b5073f9774362b06ce690e482 commit 2e55256de3e6193b5073f9774362b06ce690e482 Author: Mark Johnston AuthorDate: 2023-03-25 19:59:20 +0000 Commit: Mark Johnston CommitDate: 2024-01-27 18:51:14 +0000 route tests: Serialize These tests reuse jail names and so cannot run in parallel. MFC after: 1 week --- sbin/route/tests/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/route/tests/Makefile b/sbin/route/tests/Makefile index 1ae964693ff4..23e5ecb79143 100644 --- a/sbin/route/tests/Makefile +++ b/sbin/route/tests/Makefile @@ -1,10 +1,10 @@ PACKAGE= tests -ATF_TESTS_SH+= \ - basic +ATF_TESTS_SH+= basic +# Tests reuse jail names and so cannot run in parallel. +TEST_METADATA.basic+= is_exclusive=true -${PACKAGE}FILES+= \ - utils.subr +${PACKAGE}FILES+= utils.subr .include From nobody Sat Jan 27 18:52:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMkFf5vNpz58kCd; Sat, 27 Jan 2024 18:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TMkFf52r8z4m25; Sat, 27 Jan 2024 18:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ulKQF2w/un+md87aWxL83x8axj0Rhl1k2C1Dau+tQrI=; b=juud3qMq8oh5Kku2AhBqzXM42g789srFCTYwy7I0zS5v7fVdsqsGKR+wgT3dyk0sqEE7Yy 6iB9kQ7ENh4Kh/bbvH7RqF5U1TnJ7nCuws0uwVEhG4PN6D5JZ091wKfz2uFgmY/1UsjdTx mSffjcPcreaihNxP8I6ciEuPsfuaArE+ll6x5xDy7Rol0APDcy3HruWi22nInIz4NYYLNl kx+Cnk5Jy2hYN4egCVPViiwVjMrG92oVps6SQyl6si2tW1shZYTr94CLmSn8DWCVzcpWiw PHZmkv36DizFGOR41BPx8xP+/As8RRL5DhvK9FOPHD3CjILThw2a3Fg+9eBElg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ulKQF2w/un+md87aWxL83x8axj0Rhl1k2C1Dau+tQrI=; b=xUQwsYf2JluGa30eJCgchdPPxa20K7ZfcU4IezNZmRT6jXQ9SWefyKO9JZZ2s8Mqno8JLu pmSTH/vmAYNQ8cDP1y587hLUnq4PTZvEkRU6/OIHThuC8JG9FYXLr78xDwjHknVqVtxgua 7GOZt54au0iykJt0y7w36auG7sV76PT/GiLdlAhXp9zs8l3E6FL3EeB1onyTDPNxYsdGLJ GuxLRS+vHtNeADl1ZYVN9xS6iWLISJBXcr8WvlFOTTprUxkK/at3z8VoNcz8a61Jeu5yqq yANCTN5BvEdgm8/9fO9OCj1+aIVbPaq7fkTUdTciuwrw0G8W0KScAen+zH4gyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706381542; a=rsa-sha256; cv=none; b=bsTADD8eJ3A7C8YyIDfdYi2uqBg3LrrzH3yzdHLpY3LedTryEnhRuyA9q/aKaZ10ext74L 8bbgkSZdhoqwITnY0MOf7nSZbtzdSqRVFY+N/b/X2TUlwQkWJo+FSeZnI3fIAAbo8OdDxS xP5uUSzMc6c9ZLrGuSz0Gppfzs3P8WoyMdDWRYzmgMlJBaNRkf6mX0xUHl2CW/VeTiF6PY XFR7twKcWsT8SnzLKyADezN6nGFdUl3M67MxDlLErURA33RSJx9rtMVv5nW3EglZVTMnQh PLTIWopQP3+2kKsHzmEjdY3MLhmOga9QHxwqcgXtC6v08bJVBGRfby7GH583aA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMkFf465GzcN5; Sat, 27 Jan 2024 18:52:22 +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 40RIqM71089856; Sat, 27 Jan 2024 18:52:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIqMc3089853; Sat, 27 Jan 2024 18:52:22 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:52:22 GMT Message-Id: <202401271852.40RIqMc3089853@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3f73fbb0acd4 - main - netinet6 tests: Restore an atf_check invocation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f73fbb0acd4131b08dba4f7590061826ab08df1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3f73fbb0acd4131b08dba4f7590061826ab08df1 commit 3f73fbb0acd4131b08dba4f7590061826ab08df1 Author: Mark Johnston AuthorDate: 2023-03-31 00:07:20 +0000 Commit: Mark Johnston CommitDate: 2024-01-27 18:51:14 +0000 netinet6 tests: Restore an atf_check invocation This one has been commented out since the initial commit, but doesn't appear to pose any problems. MFC after: 1 week --- tests/sys/netinet6/forward6.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netinet6/forward6.sh b/tests/sys/netinet6/forward6.sh index 2eecbf382461..b3ccd30aea62 100755 --- a/tests/sys/netinet6/forward6.sh +++ b/tests/sys/netinet6/forward6.sh @@ -375,7 +375,7 @@ fwd_ip6_gu_icmp_gw_gu_slow_success_body() { jexec ${jname} sysctl net.inet6.ip6.forwarding=1 # Do not turn off route redirects to ensure slow path is on - # atf_check -s exit:0 + atf_check -s exit:0 \ $(atf_get_srcdir)/${script_name} \ --test_name fwd_ip6_icmp \ --smac ${our_mac} --dmac ${jail_mac} \ From nobody Sat Jan 27 18:52:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMkFh1MzSz58kCh; Sat, 27 Jan 2024 18:52: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 4TMkFg5Mn8z4mMV; Sat, 27 Jan 2024 18:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucghKaYl1u2Lr/bRpiWFZ5I/ed5fkN0AHAMpFxA80fk=; b=v2mp+MkDgPkNt4gs+Zm/TcaaFaBpDjUnrwCnP/u4RJuSTuUJF5GeqA9WJw/1ka+bJsDOic QnF9sXsP3v3YRs/0z6+AqTLl/uLPmfSz2YWZSF6Oxlv06OoWKfSnzdcUDouXHM8p9QVQW8 SBiSfdx4bn+DSAIHw0+O9gsCc90QCggtOTVu50P/uI2wdXuZp+aG/GgIsCMPMBWpB+46t1 gEG3F1aIbn+Ie4Lze3dyAWr1iTWgvXUaZ99Ze0KxmBJDZxjGMSk7F/zyj+NLKti/J3qgN5 MDsds7schms5G1PUnoFNX8ZcFP9M8Ug5eabBoiRWzv2urzxuvnvpeXrqyWAhaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706381543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucghKaYl1u2Lr/bRpiWFZ5I/ed5fkN0AHAMpFxA80fk=; b=MDclUmIggZDEWaohRxmVinnDaIM5FHKDSEh6Jk2xAsIZLxj5EFAJ3IPlN5Wb1LLIR+PJ2H mgH1p76IOCRhXnok5WJZVgCVmkowC/tnTC+uf4/rnJ9HxyMwy08llFg3I7xPgmau/SPbuC pPXrgaamgYThwSl0eoHq0ZSizHcroEs0OKZVLJgtnjK6zT0AKuzylNznmoXVLcEmCbenXf YS06VVSdRZOIab9QAYYjEorvWJEnOYTCXKiB55GFEb1dsFze53TF/sSYAz6R19Uhoo4bhE qIrnWwUufBq680AY050l+4kfxkmWlGGaXLQwF6phuduGQdegQUmXDXtuwLX+KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706381543; a=rsa-sha256; cv=none; b=FZeoGLMdiBFuhWsLvBlrNFG7bULgqQARDtDKEYVu3pq8cI0nuK4ZH/wVsDLROzRgULNG+u MaAcYoNsK4RJBuSzq3TeXfRE2hZE+zlFAdadaGp/8N735V5EFT+UB/hfBKMefZxIj3BzgH DhRdN+fsnkOoR0WrxvOM1J7jF+RsPyA3rnINJzdVnsFo6KsZK6TDGawYytCYS2I79SX9Ms uKVlNW+RyJrQdmpltaAxg7DojnAwVSouJXhRyQ1GrKxyvOY8v31XSJMLAA8DdhgONrCk30 LyhdN6YKhtRWpslcbaWlYSN5ASYWXdvTpgHyZFKnhyQym9oT60aloY99wrHmGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMkFg4RMRzbmJ; Sat, 27 Jan 2024 18:52: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 40RIqNoi089911; Sat, 27 Jan 2024 18:52:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIqNWq089908; Sat, 27 Jan 2024 18:52:23 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:52:23 GMT Message-Id: <202401271852.40RIqNWq089908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 001c48b4139f - main - netinet tests: Make test jail names unique List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 001c48b4139ff6f07de70a16518161dcea5598b9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=001c48b4139ff6f07de70a16518161dcea5598b9 commit 001c48b4139ff6f07de70a16518161dcea5598b9 Author: Mark Johnston AuthorDate: 2024-01-27 15:26:22 +0000 Commit: Mark Johnston CommitDate: 2024-01-27 18:51:37 +0000 netinet tests: Make test jail names unique Otherwise we get spurious test failures when running tests in parallel. The intent here was to name jails after the tests, but this was done incorrectly in a couple of places. MFC after: 1 week --- tests/sys/netinet/output.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet/output.sh b/tests/sys/netinet/output.sh index 9ede7e66aaa5..23d427605878 100755 --- a/tests/sys/netinet/output.sh +++ b/tests/sys/netinet/output.sh @@ -386,7 +386,7 @@ output_udp_flowid_mpath_success_body() script_name=`dirname $0`/../common/net_receiver.py script_name=`realpath ${script_name}` - jname="v4t-output_tcp_flowid_mpath_success" + jname="v4t-output_udp_flowid_mpath_success" epair0=$(vnet_mkepair) epair1=$(vnet_mkepair) @@ -510,7 +510,7 @@ output_raw_flowid_mpath_success_body() plen=24 text="testtesttst" - jname="v4t-output_tcp_flowid_mpath_success" + jname="v4t-output_raw_flowid_mpath_success" epair0=$(vnet_mkepair) epair1=$(vnet_mkepair) From nobody Sat Jan 27 21:28:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMnjX2Dn6z58xSP; Sat, 27 Jan 2024 21:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TMnjX1f3bz430b; Sat, 27 Jan 2024 21:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706390896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYwjRxu7xpqAxUW1/to78+rMhJf48GW2gbOg9AH4SAc=; b=FO3nr3CRAcBpr4QkdNJYExAQUK4bJ7kKChMSkKe1JheYY9YIeF4ZFnfWehTnVKZaZ28RuA J5snJMdIsrCPSB8oqLqmmASsy19yDetY8vrIgt2GxOhTf+EhPECJk3TPFJvml1mGXFbms/ Z8udylWDZ7mQ3Vs0bZ39KFmTGF8uoqFXRySw6yCQlU/WR6WZ56waAunZkgiiS43RMo1Ib9 L0e8BswxTJ46JaJ2bFPyDQKjYi19BfrdGaWkIhll/Z+kzXk4W9YkrPxoWaNR7gqzXf+wQT mpXSIEzov9AFqDEhXwDk5b552v49n92utObvnxK8HceWOLyS8DG8ibt3C9L/KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706390896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYwjRxu7xpqAxUW1/to78+rMhJf48GW2gbOg9AH4SAc=; b=yCCMnyBhYDl83Rq7BuxwU+tYOaAu4UVJvRuSRiPetwdaY0wvw80Egoi9bsvYN3RoCL75L8 Qod3ARrZ/0a3vJ1ZWkKKE7+PPqmu0Nv2bjnHe4gEyE3FpZO6i6bHu0HOeElZh423xahjfY BXNzrKr6/H+pRvVxL1kjpRwOF32ndsGAvGX1BC3phcTJGvAH69qQNwGv1tZ+1ICQq61zEr GuAiXdnTS75ZjSvNOWYeJUUwvd/kqlFtZxc9/BTKms6TtC/sB4yZZ1/p8naW6KPAO6BFRo UI3txkI6wWMg6SMHikt/z7DghnvzbLoAzKXBeucgVDLgwv5ceE0F+TnWD4bi/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706390896; a=rsa-sha256; cv=none; b=FXUalw3wWA60wgC/W7U5Y8XjEFzZ1VbilJ7hK1a3X7ihVEDM5WyT/AZ1/aBNxKkblkUlaf RT9Vr7hMAdwteSFcrxNF2fX6h23xIhMo1VuW7lbfeci0geRfyyihSRnL7g8fxLqmG5HUj6 SzjwatfVrq3wGZ6I1BDsKYPSxh9v5LGCu7p58x/jB0kTXMVxuzJhLPpnTotrW8yq1mTd26 ylFR387DRYLi9eREVCUqMVhhRq4n5o2CBHgLiAyWoiqEQT/P6wLsP7PcVCr470/TNr1f5U 2rN6+Ev4SWlXFnMkwqHTyXdZxSHNe5DqX6DWV3bQhPqubGCO0euov4NPb8z19g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMnjX0kW5zh2M; Sat, 27 Jan 2024 21:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40RLSGc2042810; Sat, 27 Jan 2024 21:28:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RLSG6l042807; Sat, 27 Jan 2024 21:28:16 GMT (envelope-from git) Date: Sat, 27 Jan 2024 21:28:16 GMT Message-Id: <202401272128.40RLSG6l042807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: d04e03c19a8d - main - msun: remove fabs from Symbol.map, and adjust comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d04e03c19a8d7660ea36f62720eef9bc96b69889 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d04e03c19a8d7660ea36f62720eef9bc96b69889 commit d04e03c19a8d7660ea36f62720eef9bc96b69889 Author: Dimitry Andric AuthorDate: 2024-01-27 21:24:38 +0000 Commit: Dimitry Andric CommitDate: 2024-01-27 21:24:38 +0000 msun: remove fabs from Symbol.map, and adjust comment We have s_fabs.c, but fabs(3) is already provided by libc due to historical reasons, so it is not compiled into libm. When the linker does not use --undefined-version, this leads to a complaint about the symbol being nonexistent, so remove it from Symbol.map. While here, adjust the comment about some functions being supplied by libc: while it is true that all these are indeed in libc, libm still includes its own versions of frexp(3), isnan(3), isnanf(3), and isnanl(3). Reported by: Steve Kargl MFC after: 3 days --- lib/msun/Makefile | 3 ++- lib/msun/Symbol.map | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index ed84e7b578a4..6c8c6c3e8009 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -154,7 +154,8 @@ COMMON_SRCS+= catrig.c catrigf.c \ s_cproj.c s_cprojf.c s_creal.c s_crealf.c s_creall.c \ s_csinh.c s_csinhf.c s_ctanh.c s_ctanhf.c -# FreeBSD's C library supplies these functions: +# FreeBSD's C library supplies these functions (but note we still have s_frexp.c +# and s_isnan.c enabled above, so they are duplicated): #COMMON_SRCS+= s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c # Exclude the generic versions of what we provide in the MD area. diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map index 6e74918ade6e..4d5a5e4d7e6e 100644 --- a/lib/msun/Symbol.map +++ b/lib/msun/Symbol.map @@ -88,7 +88,6 @@ FBSD_1.0 { exp2f; expm1; expm1f; - fabs; fabsf; fabsl; fdim; From nobody Sat Jan 27 21:51:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMpDY2z8fz590RF; Sat, 27 Jan 2024 21:51: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 4TMpDY2KF9z45jC; Sat, 27 Jan 2024 21:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706392301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXYlXA25JUU/t2Q6VW1QvWHagZoN5eFD7INyBU/jE3A=; b=LhUVhYORA3+GdtuGHKDcYXKFx17u1Ro0/3oa73puxYjEb3NdIKe8R0+Q0il3/gMWpGbt3P 6pYwjDPejMkTF5/yNAUeX8J521S8SSr1Ii62R3hnM0huu4wl3ErVceNbVPirqBAbPwU4v+ YW70QGUt+lnvj1c7IH6qjEZiFWbFDDxh4eWpAkoZi375o3xTif/7AZdGyeujrXDnSA0MHg uQ9xS7AmCrHinoujFCf3sENqeFvW+voCJyYRAVbzd8CeBnoDHYjcLGhtkcP0nERXiqgZiI mZmHE6DtJahhd+tLjtcU9FtkzAmtm4Tv03D/vH4rWq83hFCudCwOvIp8ekI18A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706392301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXYlXA25JUU/t2Q6VW1QvWHagZoN5eFD7INyBU/jE3A=; b=hJauGkU7MQghCfK5b9f9nfUV0oFiiTrMOAtfaSeoTHc4lI7x6ooaDTtk+CSgCLf9BKWiEQ JLFiPcNncZVUY0KXrKSP3mS31Qbm/mmeXvf8wG7Uy1DQrOobbg5m2U7OGnEoj8W8PaUS17 tUWUuE3Ava0jNor9vm10hFz74lO3hvS7yX2RF2qTWCxHV6ZC8SvtniyfBCFX3zz/RtLDG9 MeKb5PcKOHFHJnucMPnQjhBEh98oxYztfkJAncby2yJavPdtEaa77bRI2TEVGy5zPbJQP0 bl2V6Snlny6yX1ilhHn3qMxu/Z3JG/Ab+vZt0QSBaBEqLQ7yttHSZpTC1FgcfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706392301; a=rsa-sha256; cv=none; b=OJjyeIRJzOgnB8QupbKeUxWZPRw2/hDJPDlMRW9+A1zvl5TJUZFJiuTvWPzOJvvrsDmJHJ +H+p45FLHH9p06UIlKnVVeCsLN2Zl3CeDynmp5Av7dMhNHl+GQEp4c6PQwDezLKj4miAi3 nkIGFS5ES2B82EL8C9V0g88FolZsL1ALYtbNFyQQAI/eg3o0BCeULL0nOBBsMH+p4PiLBs jCRUmAgqy0kNUV8NVOrsgAp6wyhufTViPvFwlUblgiZjqRsfF8WXA+bfmZJbl96pmRoOxE h976JbybptWTeMTn9Whpsa5KggAhEV/CcdisraRnSpZNvPCz83VHVbN/AW+HwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMpDY0vKvzht1; Sat, 27 Jan 2024 21:51: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 40RLpfIC085314; Sat, 27 Jan 2024 21:51:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RLpfxN085312; Sat, 27 Jan 2024 21:51:41 GMT (envelope-from git) Date: Sat, 27 Jan 2024 21:51:41 GMT Message-Id: <202401272151.40RLpfxN085312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 31aedef26fc0 - main - Merge commit 16a1ef86cbc5 from llvm-project (by David CARLIER): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31aedef26fc0613f5d61204c624451d57e716ed9 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=31aedef26fc0613f5d61204c624451d57e716ed9 commit 31aedef26fc0613f5d61204c624451d57e716ed9 Author: Dimitry Andric AuthorDate: 2024-01-27 21:48:58 +0000 Commit: Dimitry Andric CommitDate: 2024-01-27 21:48:58 +0000 Merge commit 16a1ef86cbc5 from llvm-project (by David CARLIER): [compiler-rt] remove hexdump interception. (#79378) a freebsd dev member reported a symbol conflict and intercepting this had little value anyway. This is one part of fixing the WITH_ASAN build. Some executables in the base system define their own hexdump() symbol, which would otherwise conflict with the ASan-intercepted one. Reported by: markj PR: 276597 MFC after: 3 days --- .../sanitizer_common/sanitizer_common_interceptors.inc | 15 --------------- .../sanitizer_common/sanitizer_platform_interceptors.h | 1 - 2 files changed, 16 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index 0e563fa12022..a6cda8c6bd4f 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -10180,20 +10180,6 @@ INTERCEPTOR(int, __xuname, int size, void *utsname) { #define INIT___XUNAME #endif -#if SANITIZER_INTERCEPT_HEXDUMP -INTERCEPTOR(void, hexdump, const void *ptr, int length, const char *header, int flags) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, hexdump, ptr, length, header, flags); - COMMON_INTERCEPTOR_READ_RANGE(ctx, ptr, length); - COMMON_INTERCEPTOR_READ_RANGE(ctx, header, internal_strlen(header) + 1); - REAL(hexdump)(ptr, length, header, flags); -} - -#define INIT_HEXDUMP COMMON_INTERCEPT_FUNCTION(hexdump); -#else -#define INIT_HEXDUMP -#endif - #if SANITIZER_INTERCEPT_ARGP_PARSE INTERCEPTOR(int, argp_parse, const struct argp *argp, int argc, char **argv, unsigned flags, int *arg_index, void *input) { @@ -10543,7 +10529,6 @@ static void InitializeCommonInterceptors() { INIT_PROCCTL INIT_UNAME; INIT___XUNAME; - INIT_HEXDUMP; INIT_ARGP_PARSE; INIT_CPUSET_GETAFFINITY; diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h index c740778b6228..d7fe7e29b105 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -594,7 +594,6 @@ #define SANITIZER_INTERCEPT___XUNAME SI_FREEBSD #define SANITIZER_INTERCEPT_FLOPEN SI_FREEBSD #define SANITIZER_INTERCEPT_PROCCTL SI_FREEBSD -#define SANITIZER_INTERCEPT_HEXDUMP SI_FREEBSD #define SANITIZER_INTERCEPT_ARGP_PARSE SI_GLIBC #define SANITIZER_INTERCEPT_CPUSET_GETAFFINITY SI_FREEBSD From nobody Sat Jan 27 21:51:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMpDZ4Gffz590RG; Sat, 27 Jan 2024 21:51: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 4TMpDZ38YFz45tL; Sat, 27 Jan 2024 21:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706392302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0K5pyKjlnFSI887C2brISG9tc5h6UfhxvJ64mufhLew=; b=MB6iGuiwL2+Pq3GV3wVSVUDxjP2+r74HnRaZg6IBBYJ6aCIhZ/8A0lLj9MId21kygCh2C5 GSVuaP7+bYLdv2f8p5yIc3xGNTEXz7dPLL3ry1N34X6RSOozlxGbfMrY/4j5tZYzoJfWJX 0ktWjlT+0lUZ79VYQc3id/84Ke1kbbyWaKBEdTZmf8WdF+hy5r5Vj8UwbfmYYolu9Ia8Mh R+2930sAyG5JBfzhsdesrnAYWwVLSKPFnUDQxyTzPfkqPJgMvIZF54wnm52tXVGpjx3Dy5 oJ/Py2AoofDS3Afz/nPj/ZkE9An3m7AqyLieAHWQaLQ9O01GYypTvLbwetuceQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706392302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0K5pyKjlnFSI887C2brISG9tc5h6UfhxvJ64mufhLew=; b=QJdFBudiFttUhssjxZ7lmEaMO+WxSsIjujN/wPbAG+6C8XrDRNLtjug0uv/nLsDU3iwdVu SRfX7swsDqsV46JFS4j5qmMlA+zzV5ZpQZlU9apuDMDnNoFx7yRkDCxg9ptwyyqPrc6mFA D6jbDqVvu8A6ZEBc9TkZdY8Y4Wn8mOM+hoNg0D99easYO+Yr/4Lj+mzSDGBScr4RhHA9oe WTG4sS3HaVmfRfaLtS2soDj5mxdOv86hO7mRCjSZ+YdNl9MREpAHF0O+Oeq8y1EYQ8FRCk 89fwUc5TzRhlM9MMinRbxziHvRdnsbSsOcgdZmbV4SVK2obcuK+KZLybOtLIBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706392302; a=rsa-sha256; cv=none; b=BbK+rqe0L/bA/dKvkpU8N8hvhhd0jueHJNpfxlbAU1PA0dk4QiIRUquefC1rqH6OBJx9qu j1aaqDlkO5huW9txoraeguk6wmwYHkwPJ6Bd3hSDSnGSzZIg2kHYgatbAcFCR8QY3+OqJS ee5Meu1Wg3qm4KWIS0/tAC7nipG4Q2uahJeevLRuHgBHlM/Da4nLf12TqwsEHQZi/Kpkel P1UveFYjWT8z/ukJ/oPmuMFJkeBI2L1vYmmvcJWARn1WRX4jNhxlJyZgVENm+l0f9usW2D Rcx7i6T7L05ia5j/eCoNcjz4wf7rQHo/WQ/O0N9LRyQCqciWi0uUeqQGvOCbHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMpDZ1wZGzht3; Sat, 27 Jan 2024 21:51: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 40RLpgAS085378; Sat, 27 Jan 2024 21:51:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RLpgXQ085375; Sat, 27 Jan 2024 21:51:42 GMT (envelope-from git) Date: Sat, 27 Jan 2024 21:51:42 GMT Message-Id: <202401272151.40RLpgXQ085375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 5c38ea60a041 - main - Add libllvm and liblldb source files to enable WITH_ASAN build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c38ea60a04199dae2c6e5db82461e7275c7def6 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5c38ea60a04199dae2c6e5db82461e7275c7def6 commit 5c38ea60a04199dae2c6e5db82461e7275c7def6 Author: Dimitry Andric AuthorDate: 2024-01-27 21:51:08 +0000 Commit: Dimitry Andric CommitDate: 2024-01-27 21:51:08 +0000 Add libllvm and liblldb source files to enable WITH_ASAN build This is another part of fixing the WITH_ASAN build. Some additional source files had to be added to libllvm and liblldb, since the ASan instrumentation causes symbols in those files to be referenced. Reported by: markj PR: 276597 MFC after: 3 days --- lib/clang/liblldb/Makefile | 5 +++++ lib/clang/libllvm/Makefile | 2 ++ 2 files changed, 7 insertions(+) diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index 0dbcac7d3068..c32e4a387b2e 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -421,8 +421,13 @@ SRCS+= Plugins/Language/ObjC/NSString.cpp SRCS+= Plugins/Language/ObjC/ObjCLanguage.cpp SRCS+= Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp SRCS+= Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp +SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp +SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCDeclVendor.cpp SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp +SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp +SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp +SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp SRCS+= Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp SRCS+= Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp SRCS+= Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 3ac81305df19..df39f2eb212e 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -666,6 +666,7 @@ SRCS_MIW+= DebugInfo/Symbolize/Symbolize.cpp SRCS_MIW+= Debuginfod/BuildIDFetcher.cpp SRCS_MIW+= Debuginfod/Debuginfod.cpp SRCS_MIW+= Debuginfod/HTTPClient.cpp +SRCS_MIW+= Debuginfod/HTTPServer.cpp SRCS_MIN+= Demangle/DLangDemangle.cpp SRCS_MIN+= Demangle/Demangle.cpp SRCS_MIN+= Demangle/ItaniumDemangle.cpp @@ -1645,6 +1646,7 @@ SRCS_MIW+= TextAPI/ArchitectureSet.cpp SRCS_MIW+= TextAPI/InterfaceFile.cpp SRCS_MIW+= TextAPI/PackedVersion.cpp SRCS_MIW+= TextAPI/Platform.cpp +SRCS_MIW+= TextAPI/Symbol.cpp SRCS_MIW+= TextAPI/SymbolSet.cpp SRCS_MIW+= TextAPI/Target.cpp SRCS_MIW+= TextAPI/TextStub.cpp From nobody Sat Jan 27 22:29:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMq3k2MP3z593V1; Sat, 27 Jan 2024 22:29: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 4TMq3k1n8Tz4ChB; Sat, 27 Jan 2024 22:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706394546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TtVSLkCqUEopS82JB3YYUXn5lvrFKbhSTniNRGQrxJE=; b=EtCGtXL6qq5hSv786Vxu5uBQfFik7yyEd+yK7WCFAz/fQeVjeAdgQxHF4XH0k7CB49Z1Ye Q0s+HXVoSlR7LKid6mZxNxs64yX4IPNJZ4hSR3+fRqtVn8KpbOvKBK/1BMreevmoGSy0Zg kVKA+pQjdbm2xkrupZI3qC1x9fxFJxTdTPDPpDaPnVn9XcGIe9igBM7TQlOcLCS4qqPqnn g+A7is7Ct4rRpEIPGmLdNeth2tks2qzH7YlOCuEaBw/QohRjajd+H/I9ckuzSZToqObk79 k9KdYlSqTiDTi/FZdBPUgvxE5x9QahhkOApX7QZWObRzdhND3iylIYLgpRxoew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706394546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TtVSLkCqUEopS82JB3YYUXn5lvrFKbhSTniNRGQrxJE=; b=joGyQSoA20P1h58ZeDu97QTItjZL38xQ0B4x9DYsnEl2QvSv8yDvrb5sEjqIESaCj3yAIG a2TMBhjFwlgEaK0mY3mjGjlcI4yafPKRT171a77X+2EIyta1C9wb3P7SrQE2zEug7fYRlJ 61qM+ElbHBlFOKzIiHbE/WJ/NkbX8EfeHE/5hLQh+GAKR/AUvP0R3Cf8JK3oers7YB/M30 Uvva0WPImEBOMVOgz26yoliSbHw546MgnfjAGVv68WDdKTEjdT7g3EukxWpcEKOf3DkXC/ YRY4ah0dxaCPyPznZawoKlF5wSf0IxCdL97fYJp3TDWRtbLg/PLaOg8VARp8oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706394546; a=rsa-sha256; cv=none; b=uRQegTjjSpo/aHWwYX+avgi5fWmSzHVdeITursEJWLnzA641Mxt7CFgVtukFIEjs+tormR upqDIRVnT/wt7QNum4cDXTKbsAB3dT8uOgwP4mtGPQvRxPG/NMaXexI+ToUdRs2iDWaLt3 eQ2as8BMbLuw9nGgEagCxrPYSC3+mQL3EcZwKf2Aijp+MiJsga9IrVb5Q5cUpCpLkpLbxl tmJVbylfoshh3khLLqWi7K/D8TBarOJTBXeFN+iB+/RShq33a5+RcLhQbVsgPd9zMMG1dN GfsBwDCnLsfRu0S2K5G+7/e5XyNEneXt2loLUUkD1+VlrOFOdUAJaYj7HXMOAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMq3k0rnyzjbG; Sat, 27 Jan 2024 22:29: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 40RMT6xx043540; Sat, 27 Jan 2024 22:29:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RMT6Qu043537; Sat, 27 Jan 2024 22:29:06 GMT (envelope-from git) Date: Sat, 27 Jan 2024 22:29:06 GMT Message-Id: <202401272229.40RMT6Qu043537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 3883c6fbf232 - main - ntb_hw_plx: Workaround read-only scratchpad registers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 3883c6fbf232452098ba6ea802ef1426d83d2d68 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=3883c6fbf232452098ba6ea802ef1426d83d2d68 commit 3883c6fbf232452098ba6ea802ef1426d83d2d68 Author: Alexander Motin AuthorDate: 2024-01-27 21:51:46 +0000 Commit: Alexander Motin CommitDate: 2024-01-27 22:29:01 +0000 ntb_hw_plx: Workaround read-only scratchpad registers On several systems we've noticed that when NTB link goes down, the Physical Layer User Test Pattern registers we use as additional scratchpad registers (that is explicitly allowed by the chip specs) become read-only for about 100us. I see no explanation for this in the chip specs, neither why it was not seen before, may be a race. Since we do need these registers, workaround it by repeating writes until we succeed or 1ms timeout expire. MFC after: 1 week --- sys/dev/ntb/ntb.h | 2 +- sys/dev/ntb/ntb_hw/ntb_hw_plx.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sys/dev/ntb/ntb.h b/sys/dev/ntb/ntb.h index f9119fa0aedc..e2af625fff94 100644 --- a/sys/dev/ntb/ntb.h +++ b/sys/dev/ntb/ntb.h @@ -279,7 +279,7 @@ int ntb_mw_set_wc(device_t ntb, unsigned mw_idx, vm_memattr_t mode); uint8_t ntb_spad_count(device_t ntb); /* - * ntb_get_max_spads() - zero local scratch registers + * ntb_spad_clear() - zero local scratch registers * @ntb: pointer to ntb_softc instance * * This functions overwrites all local scratchpad registers with zeroes. diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_plx.c b/sys/dev/ntb/ntb_hw/ntb_hw_plx.c index 57e3265ee5b1..906660116067 100644 --- a/sys/dev/ntb/ntb_hw/ntb_hw_plx.c +++ b/sys/dev/ntb/ntb_hw/ntb_hw_plx.c @@ -879,17 +879,33 @@ static int ntb_plx_spad_write(device_t dev, unsigned int idx, uint32_t val) { struct ntb_plx_softc *sc = device_get_softc(dev); - u_int off; + u_int off, t; if (idx >= sc->spad_count1 + sc->spad_count2) return (EINVAL); - if (idx < sc->spad_count1) + if (idx < sc->spad_count1) { off = sc->spad_off1 + idx * 4; - else + bus_write_4(sc->conf_res, off, val); + return (0); + } else { off = sc->spad_off2 + (idx - sc->spad_count1) * 4; - bus_write_4(sc->conf_res, off, val); - return (0); + /* + * For some reason when link goes down Test Pattern registers + * we use as additional scratchpad become read-only for about + * 100us. I see no explanation in specs, so just wait a bit. + */ + for (t = 0; t <= 1000; t++) { + bus_write_4(sc->conf_res, off, val); + if (bus_read_4(sc->conf_res, off) == val) + return (0); + DELAY(1); + } + device_printf(dev, + "Can't write Physical Layer User Test Pattern (0x%x)\n", + off); + return (EIO); + } } static void From nobody Sun Jan 28 01:25:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMtzh391Vz57Mdr; Sun, 28 Jan 2024 01:25: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 4TMtzh2dkDz4cnN; Sun, 28 Jan 2024 01:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xu5GE1qeSg3Zxovw/SDoQe0H9mdnkqaQ1PhpwhbpsqI=; b=qhbUD1zJajjXNwVwboshcqp2dis61BmH64EkYX7wQLSC6NKou4guISKegbLSn7YWNUwxQQ 3LVw8t3wP460SjwX1mKBmUyYosHs/9RbjuVuyfbbUvr+wYDq9YZv2NVPHzHgME626/xDHR sAdy48pckmyHuCZwhqp1OP1w90+mTSHZf4SMYteO5NuZmaVegrQwRiPavQ7Br5bB9lnnna Yw7D3ViLu4R9lUA1F2vWgPLVDNVfAarp7jIHgrX7QnZVYZy6HlYqO9e+xDARziNeq3ah1B H3F1bJofzREPD+QOsOuNJLzMFhWF0fasfNGH9zey9hmebDyUW8Z42mtcVg6wtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xu5GE1qeSg3Zxovw/SDoQe0H9mdnkqaQ1PhpwhbpsqI=; b=vLTNqBzRPSxBI7I9RBkj3sZrahtr2+L98YTZYzo/34pC71bU32lhMJKvn5nM2q6SAFFUUO mNAhgWBJUk7hQz3P6xVM5Mt8ZToOMsfuVaG/A4Zw60MTTwPs1XtqjaVvX+RhdwRe6fw/pn jGvXeFS/X0hhUoQPz0vYJsPXP4ztXSpOSusk4V+CEIrRJnyDsq7/85iQi7Qd2ydrE4qlsZ 4Ddbt9FV9dVyllrhsA9rFxl3/h4UxsE/cubNJRLHW3eDYusXSX+1h1jMxGPjXUK9jJVJJd BhG0G518eQpyKJWDUoojBQBYFxuG2Ejewn4U61n/Tq/pdbgywWbsepqDw24WqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706405152; a=rsa-sha256; cv=none; b=dpcoIgbGgyUOkcrtjSao6jwU0ig9uYpsrqTE+nVfkMQ6PmAqGcXN1/VE2BmUBa7472xW3/ tB00kUMTRVtiiFKIf1Ud9c2XTGbbyg1MWhMwl8NLsMJMwr9AQgdxbKjGw8bUWFDIKPQagO hZTRoGQ+yVOLA9Ch5LmL3BNmJJyrz/b5xi98/W0MO1n1Tghh1cijYLA/+cI46/8DXoVTjo V/n8LuIFH7NqKhXdIlFiuNw2DFxnLJd+cjSVxc7W0BJYOx/OfTeqX0GXErpaObLc3LSWeK ZqTu6yZAFldXlfI081pFKx2M7NuAdUngxGkDY/EGMDYoamSoVhqddWfeXCqiwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMtzh1gfrznhW; Sun, 28 Jan 2024 01:25: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 40S1PqMZ046148; Sun, 28 Jan 2024 01:25:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S1PqGF046145; Sun, 28 Jan 2024 01:25:52 GMT (envelope-from git) Date: Sun, 28 Jan 2024 01:25:52 GMT Message-Id: <202401280125.40S1PqGF046145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: 4bd4942ea70b - stable/14 - bhyve nvme: Add NQN value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4bd4942ea70becc583246597b658f3dcdbffafde Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=4bd4942ea70becc583246597b658f3dcdbffafde commit 4bd4942ea70becc583246597b658f3dcdbffafde Author: Chuck Tuffli AuthorDate: 2023-10-12 22:04:17 +0000 Commit: Chuck Tuffli CommitDate: 2024-01-28 01:24:31 +0000 bhyve nvme: Add NQN value Add a NVMe Qualified Name (NQN) to the Controller Data structure using the "first format" (i.e., "... used by any organization that owns a domain name" Section 7.9 NVM-Express 1.4c 2021.06.28 Ratified). This avoids a Linux kernel warning about a missing or invalid NQN. (cherry picked from commit 32557d16e2c3c24c04eccfafd895e1514dc65b35) --- usr.sbin/bhyve/pci_nvme.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index d1b15d6f3a3c..2fd49a84c768 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -514,6 +514,7 @@ static void pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) { struct nvme_controller_data *cd = &sc->ctrldata; + int ret; cd->vid = 0xFB5D; cd->ssvid = 0x0000; @@ -583,6 +584,13 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; + + ret = snprintf(cd->subnqn, sizeof(cd->subnqn), + "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u", + get_config_value("name"), sc->nsc_pi->pi_bus, + sc->nsc_pi->pi_slot, sc->nsc_pi->pi_func); + if ((ret < 0) || ((unsigned)ret > sizeof(cd->subnqn))) + EPRINTLN("%s: error setting subnqn (%d)", __func__, ret); } static void @@ -3309,7 +3317,6 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl) pci_nvme_aen_init(sc); pci_nvme_reset(sc); - done: return (error); } From nobody Sun Jan 28 01:33:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMv8x3mGLz57NF5; Sun, 28 Jan 2024 01:33: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 4TMv8x2qzSz4dXT; Sun, 28 Jan 2024 01:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HsQfX798HgxL8EH60zrh7dzYE1fLydT4a2GoVXnZ7iU=; b=ae3ku+nb52tPKTkr8wRxpQfSBCtw/lgpZG7jOB4+5hMPMCoQaJXfUKhH32OpuLPZ9ASISl 04jEYjSYKvTyPemOEo0U56NScrD8h2XvebUyQ3X6CphjOilOBsq9yMnGEZZ2Djqt/2yjH0 0rueS+DWxmq8l3a7ZAPKvOBgVV8WXEg6jToO1ubxbd6Z0l5aXUeXClTHqHAqLO4soCAnGZ 70yDQwRrgQkbk0N8skm2Mwetysq9ZnT/CY+Y+YC3E+85vUOSntwuTpJ6RL0I9Bc+0uwX/Q f6j4U/GlDtK4x490VHoPVHo0EgBieAv7EbqZ6zw0ymBDiDhYeC+LlPtUVZ8nzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706405633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HsQfX798HgxL8EH60zrh7dzYE1fLydT4a2GoVXnZ7iU=; b=lBJVhU3kguhsA1EomZmJjpoI5xOwLNEJX17KHayCayPC7fAvHlJ5slTKYvBhnpSi0rY9yw KSwFwj2vGIjuLjI4tSQ4gfp+S+CZSKrnoXgnTZCtK5QxsjI+nFHDuk4kARAff0n5HQvzuA vBlp25/Nl2QyKXD5DD3x+E5zcdJOKl1gl6K+n1YVK8TRem3058hJXpiKkNdo3MAuPetVcH Bilm2htFOe7hWokGSmfx//ivE19lrjpyrzOy+KRTf3nRrMHgnP47ERfWnGJObHyvXdbIFD KDMq/NAfRvKuOtsIUdj8bsbYoJ8T5z3jbmr1+NHav9cR5/YjCTBv/q82d/RciA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706405633; a=rsa-sha256; cv=none; b=pGFAsrhkjt//TfLiagC4RB6HyAkm4P/R8Z4ike5YmQpkaNEdAMS34uqd3tbBHFurJpd5OK wrY1Nb6SMr9A+GW9TUh6AcutjqklyzYM6SYKFwYxM5eQ8IM8KG36nJe8JYK2N5iUWYq6Fq DPvqieJzYKatMzsScEvfyLkxTTMZ5ugPVlDFnxA2/tzUWhc6cLnLSG/8oP7LuBTctZHJYD MFOyuI9KA/qNFcsXnk2MOTcf5JIjwGWGeF9w0NgWrNXuNcHqqnlSdl0voGHYf8a+IV9jpz ynA5CK5h1LyCeOgbAsrQ+ADcHhTGG+sUa1OAMT4UhoMpinObQ5s3xm95avCFXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMv8x1t76zp2L; Sun, 28 Jan 2024 01:33: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 40S1XrBq062680; Sun, 28 Jan 2024 01:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S1XrwO062677; Sun, 28 Jan 2024 01:33:53 GMT (envelope-from git) Date: Sun, 28 Jan 2024 01:33:53 GMT Message-Id: <202401280133.40S1XrwO062677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: 55210b704a05 - stable/14 - Revert "bhyve nvme: Add NQN value" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55210b704a056dfb2ea115edb3894efe16b7411b Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=55210b704a056dfb2ea115edb3894efe16b7411b commit 55210b704a056dfb2ea115edb3894efe16b7411b Author: Chuck Tuffli AuthorDate: 2024-01-28 01:33:37 +0000 Commit: Chuck Tuffli CommitDate: 2024-01-28 01:33:37 +0000 Revert "bhyve nvme: Add NQN value" This reverts commit 4bd4942ea70becc583246597b658f3dcdbffafde. --- usr.sbin/bhyve/pci_nvme.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 2fd49a84c768..d1b15d6f3a3c 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -514,7 +514,6 @@ static void pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) { struct nvme_controller_data *cd = &sc->ctrldata; - int ret; cd->vid = 0xFB5D; cd->ssvid = 0x0000; @@ -584,13 +583,6 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; - - ret = snprintf(cd->subnqn, sizeof(cd->subnqn), - "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u", - get_config_value("name"), sc->nsc_pi->pi_bus, - sc->nsc_pi->pi_slot, sc->nsc_pi->pi_func); - if ((ret < 0) || ((unsigned)ret > sizeof(cd->subnqn))) - EPRINTLN("%s: error setting subnqn (%d)", __func__, ret); } static void @@ -3317,6 +3309,7 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl) pci_nvme_aen_init(sc); pci_nvme_reset(sc); + done: return (error); } From nobody Sun Jan 28 03:12:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMxMF4zrPz57Yq0; Sun, 28 Jan 2024 03:12: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 4TMxMF4RBlz4nnK; Sun, 28 Jan 2024 03:12:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706411577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iW24du4tS87zLZ0Xd/U10UUKIzJCjZF6CZDd8xtIucg=; b=JRox05TXR0nwAkHYBPZgF5JMOaRpmN6oge89hWEUxKP27E1bDGico6M3Lz+FoX9LORmOFl dwL0NkgZkpLAUYqXMCwKhnL9rew2OtBelj4kjyWTQmSUMFJsuiCmBXwhthkeSOkjQn9zRS +bWb+sYD9v2dHMRjY4Y5dYpRi42yA7cqZhN4k+UPYUR8os6rFMlTWfbQeSR0SxW18a2NF1 jlGwO4vNPnsDgazdMiuos3CGrm//7gGhHRZ8vspoe1flU2wD0C5HbU/UmkSGD4s21WsNjt U5TH0x3kU8kyl7T2UUhrbNcJ2yBSg9weezSkke3DusqvnIoHIIFWRcyy1N7BJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706411577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iW24du4tS87zLZ0Xd/U10UUKIzJCjZF6CZDd8xtIucg=; b=yX93DeLPl2h6AcKXImyqAK67s8hu35lwwFtwdCWEepmzd0RQ5tLtYPjfp1sRzGNe9wkuIJ L2q9Q3ovYrnhrR54FFQl42prVXPwWV/UmWJtIQiyaWMYUTmNqz5o5qTdacmXedsFvALz2r EfmzUcVleCDAqhSdbuSPIL0VMYAA29Mn4cIPg4VvTUwl/Z27LTK0XxIz70dQr8C1ofrT1A HEJx6jEwS0FcGBRl9JOoetKUTBoLxRRhcX8Bs6IRv55fX2buZ8js2p6gZKKFRZ7xWZRqx0 3IMLcRQtPEnyWU17Sz5M0XEBr7I6jenoMZZn09Bob/B/dsSFoKqNOiXGj0m9wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706411577; a=rsa-sha256; cv=none; b=a+jWYgX7z53Qn9fHORdSmm3ZOOGXA8n6kJYhoyLmEp2KsClgyTazvVp9iD37q1MJLvk2W0 +sNdZU2x1r9aLtqJiivlressPbfNHYEGLAsZa8DjBXxWhr7Z3SWhPyRCvCNSFvzI5O7/Rs aoPcmqrZ2XO1EMcSqVrLc8xJidomgcHKPzRx0YKC3UM3TEKdVqvk8hYUQa2OYD+0pISKXb Occn6Q8yeNBXBUh3tHs4D6CBC5EYnJyRX6mPqETn0GvVfcHsb3NRL/vGOeYBS6vJD7GXfz rfVHrhIOwtdGP0/Dkxuyas5OBVGCls3fgtVqDtJAaocQcoj+9fD2JrKtl8jFoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMxMF3XJmzrZr; Sun, 28 Jan 2024 03:12: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 40S3Cv2T031680; Sun, 28 Jan 2024 03:12:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S3CvGV031677; Sun, 28 Jan 2024 03:12:57 GMT (envelope-from git) Date: Sun, 28 Jan 2024 03:12:57 GMT Message-Id: <202401280312.40S3CvGV031677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4dedcb1bb54c - main - libc/amd64: Disable ASAN for amd64_archlevel.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4dedcb1bb54cbbe8043c79ad733f966b6ffc6972 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4dedcb1bb54cbbe8043c79ad733f966b6ffc6972 commit 4dedcb1bb54cbbe8043c79ad733f966b6ffc6972 Author: Mark Johnston AuthorDate: 2024-01-28 02:49:41 +0000 Commit: Mark Johnston CommitDate: 2024-01-28 03:12:01 +0000 libc/amd64: Disable ASAN for amd64_archlevel.c The code in this file runs before the sanitizer can initialize its shadow map. Fixes: ad2fac552c3f ("lib/libc/amd64: add archlevel-based simd dispatch framework") --- lib/libc/amd64/string/Makefile.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index b1369841bc74..d5bb646c5c53 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -28,3 +28,9 @@ MDSRCS+= \ strspn.S \ timingsafe_bcmp.S \ timingsafe_memcmp.S + +.if ${MK_ASAN} != "no" +# Disable ASAN for amd64_archlevel.c since its code is executed before the +# sanitizer runtime can initialize itself. +CFLAGS.amd64_archlevel.c+= -fno-sanitize=address +.endif From nobody Sun Jan 28 09:02:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN56j6j5pz589hM; Sun, 28 Jan 2024 09:02: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 4TN56j5zRzz4Tr0; Sun, 28 Jan 2024 09:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706432557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2fbfEocRNzrxAHcT3ZyGugohyMoVUkd145Sh78d8lmg=; b=YZ+tjnAyZ+r5VojVs902NeWZAHX7lGzhn15Oxf/gdWf7B0EQkRDGWljWfGSuKiF0Y9liOx 2bnmg0jZRAFSUz5A89VLok6RilLYb9SVTGePnXk0vGvMPlBsRFk7KFzYrMoNrSmDdbx5ES wegqD4egv86lLce62fkoMGr6UZ56r05D7ACe0d75L9B2WYZg0oJZhspluKu+ca8gFRGoAG DqeZ/UPqe5bDO1nOnSR02DoWEtRMA8ZMp5ax/vs4sFCzBE+LrWMLKnvXsxS2WJxgHPH3I0 H5Bj4OWJW//BNaLI6OIj0Mu8I1Lde4hWr45AvcI028ZUiTc5/2SauhbyUPuMGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706432557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2fbfEocRNzrxAHcT3ZyGugohyMoVUkd145Sh78d8lmg=; b=mFO6bW2AShghAukuzpHqSmAa+cx7+caYCtNOBpsLpZh4lHupTSeNC8uvK5BjM7ujP37NNM V7I1m81+B6rF1xxhDI1WezA+EVTyK7x5xdqxWwTOTg4QY0Ez5J0GEQkxqBMBsHSPZnaFwP pV9r2dxYnfg71dFTOxJoqB9i77wBWjr5buzIzkpqUrU/CTyrUrnW0eXgjI2joLAd0lCFF3 FxcPDU2hMmv9odtVoMRKPWlEbMhZ93jnpqEghNEvupGUTY6QUaMbhegKtoTyOms77YyuXs +aRXmeNelTuLLvoad1Hvcz6+3ZYM1/ogBowcky5V2vhrJuy/Zr7xedU1LW5AlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706432557; a=rsa-sha256; cv=none; b=IVf0Oe5lQygSf2y89ePTeTM1JHvnisgqtBIHBSgN/fhBIc3opWm6XxOZtS7Vkp3mNqeAS/ CHMVlcigJjpoGwSzv32+W3Zg5BnY6ncMY6KSJBUK5QzMbCOqWuo372qVev0p0t6GM6Tbyh p4Rj+EqSy/LxiB45YZkdysvzs3qMXSyJ+I57sU/1tfmmS2KwH490usAF/RQ8upGQ0EOsD3 RnGBgONFpzYtcsPvF9Spperj6frEHLfq99wsycqCI4P9KpAIOssRXmeo86oG9Msjplmvhv J+P1t7+/1dDUYblaoeXFvIN0wFiAcQEktfKvH7zjCbdmluGBbEjMLc9gFsk/lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN56j53S9z11HR; Sun, 28 Jan 2024 09:02: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 40S92bkJ018155; Sun, 28 Jan 2024 09:02:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S92bXq018152; Sun, 28 Jan 2024 09:02:37 GMT (envelope-from git) Date: Sun, 28 Jan 2024 09:02:37 GMT Message-Id: <202401280902.40S92bXq018152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Peter Grehan Subject: git: 2ee407b6068a - stable/14 - Fix issue with Linux guest XHCI tablet probing. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grehan X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ee407b6068a994bba45597c995c5ea76eec9cf3 Auto-Submitted: auto-generated The branch stable/14 has been updated by grehan: URL: https://cgit.FreeBSD.org/src/commit/?id=2ee407b6068a994bba45597c995c5ea76eec9cf3 commit 2ee407b6068a994bba45597c995c5ea76eec9cf3 Author: Peter Grehan AuthorDate: 2024-01-14 11:27:12 +0000 Commit: Peter Grehan CommitDate: 2024-01-28 09:01:49 +0000 Fix issue with Linux guest XHCI tablet probing. The USB3 spec mandates that the device-descriptor max packet size be 512 bytes, which requires a field size of 9 since it is a power-of-2. Linux kernels recently started validating this field, resulting in the table not being probed and the cursor not working in bhyve VNC. PR: 275760 (cherry picked from commit 0c243cd4a3671bf728f33378ac593c08d8367bc2) --- usr.sbin/bhyve/usb_mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/usb_mouse.c b/usr.sbin/bhyve/usb_mouse.c index 80f79980a98e..a37941c0cd9d 100644 --- a/usr.sbin/bhyve/usb_mouse.c +++ b/usr.sbin/bhyve/usb_mouse.c @@ -154,7 +154,7 @@ static struct usb_device_descriptor umouse_dev_desc = { .bLength = sizeof(umouse_dev_desc), .bDescriptorType = UDESC_DEVICE, MSETW(.bcdUSB, UD_USB_3_0), - .bMaxPacketSize = 8, /* max packet size */ + .bMaxPacketSize = 9, /* max pkt size, 2^9 = 512 */ MSETW(.idVendor, 0xFB5D), /* vendor */ MSETW(.idProduct, 0x0001), /* product */ MSETW(.bcdDevice, 0), /* device version */ From nobody Sun Jan 28 09:04:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN59D2yBRz58BDF; Sun, 28 Jan 2024 09:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TN59D2NKpz4Vx7; Sun, 28 Jan 2024 09:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706432688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZceQzl/+TLIVuctEhMM8wZ7VCuulPKgMQScBB8JiHDI=; b=ugkAz/eanuA4QDhaFQuEO17AzH1kvlR+l5MTlXD2GBlH7VKEmoK8rv58CNOd80dahRheVo 6p+iuxPMj+Ow5nKVbTqFkAq7Y+Ws3sdKZDSOZqwZ2ZXMXhXqlVHMbp48gTkAGHu9skAd8b RTTWbhgRfjV64szCF14zVdDEwXbMu4DrxUZxFV/2gFUFBGAVTzoRDtSA7oedxJfo4YQ2cF l2KNlf3oAeQyc0tT2uxa2nVUbis+QPuCM5C0AuwjWPKdADrvvgkg0e2Iz3MdlfWoTKIqNx UZssITRh8NS0qqb2o5RFr95RSrOaEaNJHvteAOLaUo/l14w1Yw28SRUjlOxnhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706432688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZceQzl/+TLIVuctEhMM8wZ7VCuulPKgMQScBB8JiHDI=; b=j8YtaoudhgqHiU9lSZvfGojbrFLo/W79VdjHedDCeACZwRovUMQFdZLSMyuJIEwsm8cy0q 7W4nnFloQHzx0ejwVmJkXN4+jQp4fpOFn65WYkdhpBpGP0J6fAqb81WpxYl4n5fSlIiUhH SKpjtMlhYP1yz6GHtslyBpwVOi5KsLHxPa7qnwzfCvVe+wcoBtklNvuZZuHKObi2XoJWRH vd62BmR0plMzYe9q8uiKt+3ILy6Cd41lx2P23slkDhHVE4bZThwfCpJwQCzgCTzadOW9Fu +fkM8YMYZ9sRad14S++85TKY2xSK4gt+8DX03f91JkOpQBoV4J4eb05pUhwHhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706432688; a=rsa-sha256; cv=none; b=Hzgh0/JvwQkBMv1UdlYK6gQcH9fmxiRNy5fXly00q2dDdV8B3UO09pVPgwmTe0S1Joj72i SHuPVN+aGV0sBaGmCFIcHhYnIbracJbxl/uJrVFdoffZxfIeLleTUSDpBv+ieUepTXw9+c GusrniRR/4qjHGkUSh3qE3jkC3J5HB7w4SJO/z2T4nYaGPTGsvAPgOb+PZhQEzka9AYwc5 CNezvEJ1mZ84FfuAD+2or/XYHLnQCahR+eDtzkR7nfeV6eomc3chjIRCOpCY6RYlG3++G6 CAeKGEAPpsjqy1UHo2QIRlM0RIEWY+R1R+ujSrUURwKLZTTR0zUJSrFIUaiirg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN59D1QzNz124s; Sun, 28 Jan 2024 09:04:48 +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 40S94me9018550; Sun, 28 Jan 2024 09:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S94mUg018547; Sun, 28 Jan 2024 09:04:48 GMT (envelope-from git) Date: Sun, 28 Jan 2024 09:04:48 GMT Message-Id: <202401280904.40S94mUg018547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Peter Grehan Subject: git: 48214dfab801 - stable/13 - Fix issue with Linux guest XHCI tablet probing. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grehan X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 48214dfab80155c03b9b22aca9f9810774c151e9 Auto-Submitted: auto-generated The branch stable/13 has been updated by grehan: URL: https://cgit.FreeBSD.org/src/commit/?id=48214dfab80155c03b9b22aca9f9810774c151e9 commit 48214dfab80155c03b9b22aca9f9810774c151e9 Author: Peter Grehan AuthorDate: 2024-01-14 11:27:12 +0000 Commit: Peter Grehan CommitDate: 2024-01-28 09:03:25 +0000 Fix issue with Linux guest XHCI tablet probing. The USB3 spec mandates that the device-descriptor max packet size be 512 bytes, which requires a field size of 9 since it is a power-of-2. Linux kernels recently started validating this field, resulting in the table not being probed and the cursor not working in bhyve VNC. PR: 275760 (cherry picked from commit 0c243cd4a3671bf728f33378ac593c08d8367bc2) --- usr.sbin/bhyve/usb_mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/usb_mouse.c b/usr.sbin/bhyve/usb_mouse.c index 80f79980a98e..a37941c0cd9d 100644 --- a/usr.sbin/bhyve/usb_mouse.c +++ b/usr.sbin/bhyve/usb_mouse.c @@ -154,7 +154,7 @@ static struct usb_device_descriptor umouse_dev_desc = { .bLength = sizeof(umouse_dev_desc), .bDescriptorType = UDESC_DEVICE, MSETW(.bcdUSB, UD_USB_3_0), - .bMaxPacketSize = 8, /* max packet size */ + .bMaxPacketSize = 9, /* max pkt size, 2^9 = 512 */ MSETW(.idVendor, 0xFB5D), /* vendor */ MSETW(.idProduct, 0x0001), /* product */ MSETW(.bcdDevice, 0), /* device version */ From nobody Sun Jan 28 11:09:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN7wm3Ynyz58Mb2; Sun, 28 Jan 2024 11:09: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 4TN7wm33znz4g7y; Sun, 28 Jan 2024 11:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706440152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1Q3wpYNtkjolkMsEtJDHIu89KT8ISAXxNFVbqApd8w=; b=dZeArt+f4AG0xDkL+aGFMSbnW02s1XwgxoF3K62pY1mMk3LkV4MQX1ptrSTp4wEy1GIXSg i8ZxGEAth8Q0atBf0//p83/3PE+o7ue8Jd+XZO1L1d4L2wFm7jjj3kdp+bztT4F0njTfpo eOWotR0p/s1uctz6gpjcdErXlx4MtaSjVDSPiY+pn78w3PsQl5zRbYifDWAxiokMceW8ui fOul1IP2WV/5AaM2VE1zn+g5L9GhrMW/YZNuhvtetbP/Sc/LnDJiun8STBeGZUqYqJny+p euu8mf5bQi+HY4dQgRAiKRD5jYoTEr8Tb/zRCCW4qTLUp6s7CmoWHJEIf9ux9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706440152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1Q3wpYNtkjolkMsEtJDHIu89KT8ISAXxNFVbqApd8w=; b=beZGodRcj53ulC+MsLJxckusXAv26UXR9B1nit6WivAgFtXefA6CsnzM0vR2er51MTD3MP kc2p6b+J/JsTiKOVDAq7gRca6rUEQfJhgAEWs3IS5dUKVXvMmRdxCAJj8G/ybE9gAmV0G2 qYKCFvrL1XnKFDn42ZXlRqZeILhhcucu/HavToRbgF0h9YVMZSh1eixzEV6jEnvSsIaCTI Zk2I655KSnDhLXzMp+uOdPSte7GO9EAEJA+u0YAqwW1aDCtCOSnaCYMrxkEOwiGdNfobtr nEy1zCb7aq7sXM2PWNjfxkwzl674VXrlt12FEpDy02mjoVYRTPd+HppHbi4Uwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706440152; a=rsa-sha256; cv=none; b=RiA1RxvMnGt2/bPdfWkYyUYhkZIb1wljCmY3Ekz524h+8eZrZWTQXfHknqOLSv0pn8cXCF cAS0a++wJUlxIEv249NAsHzxL4OJR0C0bxHRflaYLEhKSMZYbTgtokV5jcQzWUcVsd6jlT 8XUiWxOrOatkQaaK9BgKW4fgIn3mAnbfOQHp1FAlxaKkKWKwKpRSZzKUZ3MF1jeXZkgCwU ulifZFV3tZYcys8wFEApKBEIhFUHOdxhOp1JAjZZSNb7ZKe1k98Mq04Kk92OtyAlpdeJe8 KWuNGZ7TCPRjmD+eTrs9T/yfCMw5tXvIV37kxqaxwhE1ddDwwX4PQn9HtSfxdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN7wm27Zrz15C1; Sun, 28 Jan 2024 11:09: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 40SB9CiN020605; Sun, 28 Jan 2024 11:09:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SB9CYp020602; Sun, 28 Jan 2024 11:09:12 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:09:12 GMT Message-Id: <202401281109.40SB9CYp020602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 34694f3da7f9 - main - ds1307: restore hints-based configuration on FDT systems List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34694f3da7f9537c34b1878206c65a8cda16c6c0 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=34694f3da7f9537c34b1878206c65a8cda16c6c0 commit 34694f3da7f9537c34b1878206c65a8cda16c6c0 Author: Andriy Gapon AuthorDate: 2023-05-02 20:46:39 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 10:45:57 +0000 ds1307: restore hints-based configuration on FDT systems Fall-through to non-FDT probe code if no matching device node is found. While here, fix indentation of the switch statement. Also, make the device description for the hints-based attachment the same as for FDT attachment. Fixes: 2486b446db ds1307: add support for the EPSON RX-8035SA I2C RTC --- sys/dev/iicbus/rtc/ds1307.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/iicbus/rtc/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c index e8d24880571c..cc232bae0e94 100644 --- a/sys/dev/iicbus/rtc/ds1307.c +++ b/sys/dev/iicbus/rtc/ds1307.c @@ -225,10 +225,8 @@ ds1307_probe(device_t dev) return (ENXIO); compat = ofw_bus_search_compatible(dev, ds1307_compat_data); - if (compat->ocd_str == NULL) - return (ENXIO); - - switch(compat->ocd_data) { + if (compat->ocd_str != NULL) { + switch(compat->ocd_data) { case TYPE_DS1307: device_set_desc(dev, "Dallas DS1307"); break; @@ -244,11 +242,12 @@ ds1307_probe(device_t dev) default: device_set_desc(dev, "Unknown DS1307-like device"); break; + } + return (BUS_PROBE_DEFAULT); } - return (BUS_PROBE_DEFAULT); #endif - device_set_desc(dev, "Maxim DS1307 RTC"); + device_set_desc(dev, "Maxim DS1307"); return (BUS_PROBE_NOWILDCARD); } From nobody Sun Jan 28 11:12:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN8054PWzz58N52; Sun, 28 Jan 2024 11:12: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 4TN8053yz4z4gXJ; Sun, 28 Jan 2024 11:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706440325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EGWfjNjL35jeHVF3z5PvUj8kQ8zFX1DcKRRTDGnvdmM=; b=NXu24mdv9dGxsp3sW0respywqZrO5nZg5aovpIN1H3ukPIUoAIcO5oS70KiNw/rwQU0L/8 QNULZcreqKzpBkldwhggghoq9P+UJOf2AKhbZoqhpgo1ZFxEV//xm15h8mFLdj8rvzqwl1 5FX6ERy0A9zGALz8v4lnHz3VMmmnseAbc7D5A3nFKfFY90ftiMScPFlHiFksPpdpwWZePJ VEgddwJ7nyv75sPpkDl9R4aRcvn930XHRxxl2ZMFR3i3/op0ArpUgQbxXIwMvpK2Gu+O+G N22jnnclNuw6ij3iudp/es2v22+cKTHCEIaDijw7phbICZBQ/9oSk4xyCjbGSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706440325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EGWfjNjL35jeHVF3z5PvUj8kQ8zFX1DcKRRTDGnvdmM=; b=a265KacYywI2XVR0iLCwBdvj3kd6uCsUPYJapnTmd0eRgVoDjLwbAEFOQcxA41r3CkGmRB u8bB6fWRmXwBOohbO3mwygdiBfmACILvTZno911CuagB38s7qc9xRiuzegIuTS3hPsqnDl o/D4MzJRB36ruvBSVJLfnWT8X/uGXVePTc8KZukU5c2hjqA+N4j5ABxByn9NAA7i4gMPx8 ikwgv6cdCpt83hv6RYQk1uI+rtAOCfXQPQY66y8UIEVmAilN7qStqJ3xkJrflpncSW+Fdt 0cqTcPjLVNLFUPXzVx8lmPCC+XeVcNTjo+ck52n2P2Q7t08DUv6gpB+pqw0p5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706440325; a=rsa-sha256; cv=none; b=r+tnlc4z+XsWK/7Zr71rp6iopvQ5J0cEs+v8U8//54l9emVNbLFiM3U+6nT5ts5F4ORT/1 wdrKcxX9zqvvdeUezQqbr5BFDcOy6bJ8AKgzFC9M0BA/TovpBbjLSOdXCH1QWgqvNGAoOK c8QStG9vJRl8ZJXfLL7OVy6mY+uoUKCSItw11BKSUWOyuIsq73HiK39Y9247C2fm4dXOqf rgnFdk5mO1d33s8Gak6acC0O6WpyGsEq57MNVeIYHKzZ0aRvANwVJCYRbVFmExTGKuMpG8 5xQqAxmHo+KY3RbNbMfZlg21NZ4llUHCCYs71tyDKhndnjj9/HE68XE2Ob73yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN80530Xrz15Cb; Sun, 28 Jan 2024 11:12: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 40SBC5So034086; Sun, 28 Jan 2024 11:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SBC56C034083; Sun, 28 Jan 2024 11:12:05 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:12:05 GMT Message-Id: <202401281112.40SBC56C034083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 5b54b6ac8ca1 - main - usbdevs: add Ralink RT7601 aka MT7601 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b54b6ac8ca1bc0653a3b31e79c1bffd9b227c6e Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=5b54b6ac8ca1bc0653a3b31e79c1bffd9b227c6e commit 5b54b6ac8ca1bc0653a3b31e79c1bffd9b227c6e Author: Andriy Gapon AuthorDate: 2022-07-10 20:11:56 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 11:10:51 +0000 usbdevs: add Ralink RT7601 aka MT7601 This is a popular USB WiFi chip. Unfortunately, it's not supported by FreeBSD yet. --- sys/dev/usb/usbdevs | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 221761af4fe7..65dcb06c2f3f 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4042,6 +4042,7 @@ product RALINK RT3573 0x3573 RT3573 product RALINK RT5370 0x5370 RT5370 product RALINK RT5372 0x5372 RT5372 product RALINK RT5572 0x5572 RT5572 +product RALINK RT7601 0x7601 RT7601 product RALINK RT8070 0x8070 RT8070 product RALINK RT2570_3 0x9020 RT2500USB Wireless Adapter product RALINK RT2573_2 0x9021 RT2501USB Wireless Adapter From nobody Sun Jan 28 11:14:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN82N3WfJz58NG0; Sun, 28 Jan 2024 11:14: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 4TN82N1jWRz4h4j; Sun, 28 Jan 2024 11:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706440444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SWIAigasrJoLebQ1rtHVNc5Id9EqivXN5rkJhNEGURs=; b=skfv1z7vljCo8OekwK9qFuPjZiDUnBy3albZBsQ8It1A26KEuHrPaCdzVRHQ0wPFX/yvKO NzpKP+C9UndcyMDsar/O6SW5VQ6UEsvOkKIT3cI/X+bjO8OLKT5L83igrNpkDs6/Zhvryi 7laMTuiKTn+hR14yA+tNM49pT2wW4DuYE65jFL5PGx4BfzLgO49JOY3e5IePqjRbQhkBHi cDGur6NFXPyQgCVf8Jh/MBfwe38/g0Tnbr4aw7kt7psct+xpYFBca60xGhFnaOHcvcGF4y i3FQaH4sLtmDEPNYfmjz9DcEeNWMqIOPQ0nhb5GfJ641YRfoQGwsIm4qf6xZgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706440444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SWIAigasrJoLebQ1rtHVNc5Id9EqivXN5rkJhNEGURs=; b=tWkpJofKTqlV80uWIKjh/1tBNeX8z5O3tIxXg8WFrx+zYe7nAN8yK893lDz8LnSrEuPNbM KIti8mH5CeT4on+4QWNfRGJnvrT4QHkM54y1vDVV3+B5P318yBBVDNsr35NDqaVtyt4rQG EhdUAgIuJFGr1t/s6804jVn4iD5RmG4V2L290up/igXmoAxt7Fa1TyaGhXAUPjoQh21nEj fIEOfxHCVRIGv4ZQtyGTnB4cVYsEWdFiEy7iC6IdWJ4Ezafhh/YDpBcBiSG3P0tlFK+TGp JCw9RkEkNJGLO0C/nCm6Rsn50IujNQM9NoAV3UpJ+4n47Opq6o3fh1OB3f+y2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706440444; a=rsa-sha256; cv=none; b=OXMQOt2F6PO+S7Q2dhPQ0Hb0iNdxn/zrU8cVI4IYKROYGlZft8Pl+wd5gIZG32HE6Gx8yM 4nTbYNEtIc9z+lIGhBko9t0T9jh2+HmR7RwDOQxwqhfhLA5NX9eUUU9wN6p4yVdWwUd7XW yVnzhaBCacqvi5HPy3HHEtqOUxIQ3y/fLl1vI4MQDeJz0K9tUpqtLvQPT6fg3pT5HaE6zm 6Wvwjnza3qabWI7UkN/rgf5vCCO7wDiwKjhKcXp8EjbPjr+SjGp5rUDAtcvSKRyjbdYc0f 3nq9X7RYP802xjyvrXGRmYf00HYRB/nkj2i0GWTh0t/mbwyXknwfczpwm1qvxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN82N0VgZz15GB; Sun, 28 Jan 2024 11:14: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 40SBE3hM036394; Sun, 28 Jan 2024 11:14:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SBE3Pp036390; Sun, 28 Jan 2024 11:14:03 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:14:03 GMT Message-Id: <202401281114.40SBE3Pp036390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 197944948e62 - main - add allwinner overlays for enabling additional USB ports List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 197944948e6229f625306f38403737ed723e544e Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=197944948e6229f625306f38403737ed723e544e commit 197944948e6229f625306f38403737ed723e544e Author: Andriy Gapon AuthorDate: 2022-07-10 20:09:23 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 11:12:39 +0000 add allwinner overlays for enabling additional USB ports For instance, on NanoPi NEO two additional ports are available via a GPIO header. --- sys/dts/arm/overlays/sun8i-h3-usb1.dtso | 14 ++++++++++++++ sys/dts/arm/overlays/sun8i-h3-usb2.dtso | 14 ++++++++++++++ sys/modules/dtb/allwinner/Makefile | 4 +++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/sys/dts/arm/overlays/sun8i-h3-usb1.dtso b/sys/dts/arm/overlays/sun8i-h3-usb1.dtso new file mode 100644 index 000000000000..247faa370a14 --- /dev/null +++ b/sys/dts/arm/overlays/sun8i-h3-usb1.dtso @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/usb@1c1b000} { + status = "okay"; +}; + +&{/soc/usb@1c1b400} { + status = "okay"; +}; diff --git a/sys/dts/arm/overlays/sun8i-h3-usb2.dtso b/sys/dts/arm/overlays/sun8i-h3-usb2.dtso new file mode 100644 index 000000000000..02533289e3dc --- /dev/null +++ b/sys/dts/arm/overlays/sun8i-h3-usb2.dtso @@ -0,0 +1,14 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "allwinner,sun8i-h3"; +}; + +&{/soc/usb@1c1c000} { + status = "okay"; +}; + +&{/soc/usb@1c1c400} { + status = "okay"; +}; diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index 524636e380d6..f04be9ca0dc9 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -29,7 +29,9 @@ DTSO= sun8i-a83t-sid.dtso \ sun8i-h3-mmc0-disable.dtso \ sun8i-h3-mmc1-disable.dtso \ sun8i-h3-mmc2-disable.dtso \ - sun8i-h3-spi0.dtso + sun8i-h3-spi0.dtso \ + sun8i-h3-usb1.dtso \ + sun8i-h3-usb2.dtso LINKS= \ ${DTBDIR}/sun4i-a10-cubieboard.dtb ${DTBDIR}/cubieboard.dtb \ From nobody Sun Jan 28 11:31:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN8QH5CXhz58PjB; Sun, 28 Jan 2024 11:31: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 4TN8QH4kqrz4jRt; Sun, 28 Jan 2024 11:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQqWhyA4nx24S0Pv4+Au2aeYPz8m4lJWge+2ftRfVr0=; b=T69k/809kc1GKfjp5Q0/pHPX2aELj6FOW2DrlNZeSD0EAWkOEu1I3o8VqxJcJ1ELTadAXy D0nCoo2FsxJ/WHW/IkeZSVWy1nvG5ty9wtrUWCKIhb48B201WhxIX74sSyffz0+X06BX0t GE+XeNnrxnkDrFHTQ1DHdNLHdQ79/7Bqxxjawi/6FsIPhs+sw8NyB4eqtp72ugTNWe4RVy uPOncw7weuqz9hw+Elty7VqF9NHVHD9V02YpuvTB7dmp129Vwp9JsKts2bQnQb+//nTdy5 LFzzguTvZxELN6e+z5f9ZJwKUiCtcoKlKjwG3DJnch+jBQTTjok8qaOZowzISw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQqWhyA4nx24S0Pv4+Au2aeYPz8m4lJWge+2ftRfVr0=; b=BEKpPS56f319m//nnm1Y7uUfhkUMi9bK09hm3nIlx2fJofLMUkzrheDLhRqpf25BnNsdxR iuJD3Upv94wP3FzWqwsATqAdxTTIZKR0UX18pIZfSUhuo80Bk5MRgRYqcqOhWOxBGriBUO 6QY3uL2J4Xu7Ou8+tDcmHJWJDXPxgugppMUBhqtl7xY6Muv1BmbuTqlFEVUKVUgw8iOxoJ M4/trIYAvp2p4o8xaKaI70NVCGRkOK4ES6INvKYtv5/+22QjY9TrcFRz4GvZV2OQWYZJlD tnEJpxRuMuwYOR+Rvu3KWnb//9jswNZL56fRWN5hjTerBzHCSwGJ8TM991jH8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706441479; a=rsa-sha256; cv=none; b=ot4zLJFkIymfrchsbxjBZoxxDKWR8i525shI8t7XSrY4InUPiYWapIPZmCk2Ohx9ttEP+T 2Yx6+RVZyBw4VS107AYbZB5btti1nz0741C8a1lkR0Ykz5dQa/qu5z74nGZ/Ls3TGb2IIf ibkGCSQx2gvZHRVKcollywYTDN3VAAOAg0kaMJmNxCDHnB/PksxtqvAAP+VMF2D+XXaU48 aqu05TC1cB7ckLtEjHuXliIF3VWKI+rMbVl9BuyWfBpn5jUSYKvTcCfAuycn0k9X9EIRic aiaGzLusUuL84RabmJvcJS7xTtMWPFbCdzEms2mhFat245vLyrP37o7/DewGrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN8QH3VwGz15w8; Sun, 28 Jan 2024 11:31: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 40SBVJjj066679; Sun, 28 Jan 2024 11:31:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SBVJCs066676; Sun, 28 Jan 2024 11:31:19 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:31:19 GMT Message-Id: <202401281131.40SBVJCs066676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 320e4beb9761 - main - gpiopower: trigger low, high and both edges List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 320e4beb97618c6964380bfa404a3e96c5de7663 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=320e4beb97618c6964380bfa404a3e96c5de7663 commit 320e4beb97618c6964380bfa404a3e96c5de7663 Author: Andriy Gapon AuthorDate: 2024-01-28 11:29:41 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 11:29:41 +0000 gpiopower: trigger low, high and both edges Power off or reset may be activated either by low or high signal or by an edge. So, try everything. Also, the driver now supports DTS properties for timings. Finally, the driver does not change the pin configuration during attach. It is assumed that the pin is already in a state that does not trigger the power event (otherwise we wouldn't be running). --- sys/dev/gpio/gpiopower.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/sys/dev/gpio/gpiopower.c b/sys/dev/gpio/gpiopower.c index 5c369396813f..2f09f79850d5 100644 --- a/sys/dev/gpio/gpiopower.c +++ b/sys/dev/gpio/gpiopower.c @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -41,6 +42,9 @@ struct gpiopower_softc { gpio_pin_t sc_pin; int sc_rbmask; + int sc_hi_period; + int sc_lo_period; + int sc_timeout; }; static void gpiopower_assert(device_t dev, int howto); @@ -65,6 +69,7 @@ gpiopower_attach(device_t dev) { struct gpiopower_softc *sc; phandle_t node; + uint32_t prop; sc = device_get_softc(dev); @@ -80,9 +85,20 @@ gpiopower_attach(device_t dev) sc->sc_rbmask = RB_HALT | RB_POWEROFF; else sc->sc_rbmask = 0; + + sc->sc_hi_period = 100000; + sc->sc_lo_period = 100000; + sc->sc_timeout = 1000000; + + if ((OF_getprop(node, "active-delay-ms", &prop, sizeof(prop))) > 0) + sc->sc_hi_period = fdt32_to_cpu(prop) * 1000; + if ((OF_getprop(node, "inactive-delay-ms", &prop, sizeof(prop))) > 0) + sc->sc_lo_period = fdt32_to_cpu(prop) * 1000; + if ((OF_getprop(node, "timeout-ms", &prop, sizeof(prop))) > 0) + sc->sc_timeout = fdt32_to_cpu(prop) * 1000; + EVENTHANDLER_REGISTER(shutdown_final, gpiopower_assert, dev, SHUTDOWN_PRI_LAST); - gpio_pin_setflags(sc->sc_pin, GPIO_PIN_OUTPUT); return (0); } @@ -107,10 +123,16 @@ gpiopower_assert(device_t dev, int howto) else return; + gpio_pin_setflags(sc->sc_pin, GPIO_PIN_OUTPUT); + gpio_pin_set_active(sc->sc_pin, true); + DELAY(sc->sc_hi_period); + gpio_pin_set_active(sc->sc_pin, false); + DELAY(sc->sc_lo_period); gpio_pin_set_active(sc->sc_pin, true); + DELAY(sc->sc_timeout); - /* Wait a second for it to trip */ - DELAY(10000000); + device_printf(dev, "%s failed\n", + (howto & RB_POWEROFF) != 0 ? "power off" : "reset"); } static device_method_t gpiopower_methods[] = { From nobody Sun Jan 28 11:32:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN8S81Z5tz58PlG; Sun, 28 Jan 2024 11:32: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 4TN8S80z7zz4k2s; Sun, 28 Jan 2024 11:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mjrIA8Ct+V1IlH2/u0d3ZkU3u4w1wChDrFpr/I1coY4=; b=UBX2VJ+B5ad+mdmjhhPJmLf68vHGUiMBCU7Q6iwUMGwdkNELu9rBYqLJZR5BCMWwU8mPGV LAXcq1upE8M/tdB59WTMoyP/iA9tD2anvhQla/hXw1aEr/SBpRruDM4hT9zgg02xLfA4Dx /rZQcEgFioRVWSsasVtKFspzdEK/nAkBwANSmln9qYXdbjKdxv6/krpTByPaNKKjuQ239j WjrIiLnTg/GqHfkobBdJ57gio5T4xyMushZXvQD/djupIjB0AjqFJy965RLCQkRj9ieH2L +o6QAQhke+ahzcq0mHzRymDuPpA9zfbUp3eQiO6IJekRFxmxq+/sgx/GaLJ6OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mjrIA8Ct+V1IlH2/u0d3ZkU3u4w1wChDrFpr/I1coY4=; b=WsO3mxZC5rM4o74h+8Y6d69C24VXqKnRLly5faUWBqXs3ADYZJwRJQfFMQhIDNnt6BH3Ev Lc/JmSSCVg+1J/NcGCcr14Zq5hu1b6pT2FjWh5eVspudLZsriO9s+97jbKXFaY61j6jQtl 6hkIDJQ4Mwdg81NCPaDAhB++ohg1lE7VySpe/4Lf3IO1PTIwXf+mEZfizATiN2lBsE60UF 58p7rZi51sXXaVk9ndOVu2mLk49yBdxQSYL2fMQV0UAj38xiLNSktfcSsdKQky9zuN0uI4 6J3UgESGBM+vpBHe+/l7LDB4wEitPxmm7s3YhdRYc2hDhegLn5abNKdZYXKXng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706441576; a=rsa-sha256; cv=none; b=HgY1Ss/IxkRWgv6/C4aFYJgzFn/zX3xENw8UvdA5QY7bt60/TBIecAbWAn9ldQJ/lsctQ1 OVuc0HkexD7bPz5PU9clwo7lQbL/rqjD3VvXLAoXo8hMUfqipSYSguGOCQeNLoDsS3g/dF UGk8jiZt212obtCKz03T7ble9jh6Z5XNv/0DnOXVkFoHOSc5KcJ/yIfq7RGcs8V+pDTgE/ 1Ovi3HRpCL2O5qmH3bWhiFDW62ZX7OOYoIkn0XRlmvXLkLIbpNtKePMgAKqaeh9N5lvrSB P+wwbN8yqL5OufspyHV4xyq/HZc8JTwO2L4mqAjFUSLsAEZiel2dEjLVDAU+Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN8S801xZz15fh; Sun, 28 Jan 2024 11:32: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 40SBWt48070027; Sun, 28 Jan 2024 11:32:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SBWtcg070024; Sun, 28 Jan 2024 11:32:55 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:32:55 GMT Message-Id: <202401281132.40SBWtcg070024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: b587cb69f35c - main - audio_soc: set "status" as being at simplebus List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b587cb69f35cd7bd280fe1f8c82b37f56f10d5cf Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=b587cb69f35cd7bd280fe1f8c82b37f56f10d5cf commit b587cb69f35cd7bd280fe1f8c82b37f56f10d5cf Author: Andriy Gapon AuthorDate: 2022-01-11 12:28:48 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 11:32:38 +0000 audio_soc: set "status" as being at simplebus This is more true and less confusing than previous "at EXPERIMENT". --- sys/dev/sound/fdt/audio_soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/fdt/audio_soc.c b/sys/dev/sound/fdt/audio_soc.c index c7f09e3787db..3e937720bb5b 100644 --- a/sys/dev/sound/fdt/audio_soc.c +++ b/sys/dev/sound/fdt/audio_soc.c @@ -408,7 +408,7 @@ audio_soc_init(void *arg) pcm_addchan(sc->dev, PCMDIR_PLAY, &audio_soc_chan_class, &sc->play_channel); pcm_addchan(sc->dev, PCMDIR_REC, &audio_soc_chan_class, &sc->rec_channel); - pcm_setstatus(sc->dev, "at EXPERIMENT"); + pcm_setstatus(sc->dev, "at simplebus"); AUDIO_DAI_SETUP_INTR(sc->cpu_dev, audio_soc_intr, sc); AUDIO_DAI_SETUP_MIXER(sc->codec_dev, sc->dev); From nobody Sun Jan 28 11:33:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN8St1ZBsz58Q6G; Sun, 28 Jan 2024 11:33: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 4TN8St0xZcz4kKp; Sun, 28 Jan 2024 11:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZw8ir+F8lD9RbskPqnHBO244dHUN1HRTfkDp3akI9M=; b=fgzLirDb74AEEEIvRysEBWUSTV4kaa/kCYHfIpAKD5gZJJSHjEy4apZuWgDjM7sLiMA82m whl9+uRgsTkZIAM3/dAkBOf4MkvrfrIGO+wFW9pmaLqr/0/k2Myy5eHMc7923epcvH8nrp 2YdJfztYKo1HzPMYoOFlmwZCvzlg5PmRb641wPnm5ZnVACTJlLjSiwjderZzOl6Mtoh1KQ UEJ5DlZEkMv9R6iiqCW6Z1WEICuPhivnO49DYYv/Ldhgpt2AxXgf5MJI0HYsw6zKbUnh6Y 0mWn4p/1agDklN15cMxDjGwsJr6Gz/gEvdJPyl22h0Q6f4t7g5mvGW9mx8i2jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZw8ir+F8lD9RbskPqnHBO244dHUN1HRTfkDp3akI9M=; b=Q2QflmV6nx4Rk1LDeKuZAKq7nakUpvK6ou0Ju0ChB8GcjcgBh2skZtlsT5kiNC2PGXYUwa zP58dmenFyjIsAKjV8QYejPzbeK+bzLgexk4ObAtADJt9PF+z12bD4CbuE/1fyfefEktWm iu0vpACrzac0pPWKR3a0NOqsy4QivbvFLy+W1GLai7/KPa45bmCb8WADu4WGTBNX9Lm69M e4Dz1UqRuApDGIBtxvtN4qZQjxAyqZlv2uM11NXdQZ4IRdYe01lQvnm1Gg7A+8SmQsQvuu 7CiBqNLeclei4GTblpX0tb8JoeB8U/Jo5GWQTpQ1U1E5KmoClKHvr0h8+7EtjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706441614; a=rsa-sha256; cv=none; b=beEXGnHkxJCzeVhT72o+G6GOlNUuNESvsUeEVhscEmvV1T8bdpvLmiyaKNvR8JzYNKjA5T u4k5xjV8h8Tr4DHU3V36QuiuA+jw2QhRM018Mp5anApX68aEnRHWon4aKipKU7TIC8YSDb 4rQQsk5+XnCwu5tyqW4MA0EdDiW7/DAy+56pa709BLWMInDBKvAo5mNgSngLQl/TRcrZjV NlZpv1lENNfLgy9H734H9V99Lhir5Mbg4MFl/s9iXxYPWfms4GHg7fOG4gjkcsHv5tqiXl 8bmHN8RsItftzLmOPJFg/kUOZk63HZRMzyFqP1CWze6ZKXd8fDjttnKCg3/S7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN8Ss74Rzz15h8; Sun, 28 Jan 2024 11:33: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 40SBXXEr070284; Sun, 28 Jan 2024 11:33:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SBXXlX070281; Sun, 28 Jan 2024 11:33:33 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:33:33 GMT Message-Id: <202401281133.40SBXXlX070281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 408a9efd75dd - main - rk3328_codec: remove diagostic printfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 408a9efd75ddcf59a05069681c3b32cb1118aa9a Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=408a9efd75ddcf59a05069681c3b32cb1118aa9a commit 408a9efd75ddcf59a05069681c3b32cb1118aa9a Author: Andriy Gapon AuthorDate: 2022-01-11 12:01:31 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 11:33:16 +0000 rk3328_codec: remove diagostic printfs Most likeyly there were intended as reminders for unimplemented functions, but they do not seem to be useful. Also, a small style nit. --- sys/arm64/rockchip/rk3328_codec.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/arm64/rockchip/rk3328_codec.c b/sys/arm64/rockchip/rk3328_codec.c index 91d73ee4ca34..480a1087ea2d 100644 --- a/sys/arm64/rockchip/rk3328_codec.c +++ b/sys/arm64/rockchip/rk3328_codec.c @@ -434,11 +434,9 @@ rkcodec_mixer_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned rig RKCODEC_LOCK(sc); switch(dev) { case SOUND_MIXER_VOLUME: - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); break; case SOUND_MIXER_MIC: - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); break; default: break; @@ -546,27 +544,15 @@ rkcodec_dai_trigger(device_t dev, int go, int pcm_dir) { // struct rkcodec_softc *sc = device_get_softc(dev); - if ((pcm_dir != PCMDIR_PLAY) && (pcm_dir != PCMDIR_REC)) + if (pcm_dir != PCMDIR_PLAY && pcm_dir != PCMDIR_REC) return (EINVAL); switch (go) { case PCMTRIG_START: - if (pcm_dir == PCMDIR_PLAY) { - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); - } - else if (pcm_dir == PCMDIR_REC) { - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); - } break; case PCMTRIG_STOP: case PCMTRIG_ABORT: - if (pcm_dir == PCMDIR_PLAY) { - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); - } - else if (pcm_dir == PCMDIR_REC) { - printf("[%s] %s:%d\n", __func__, __FILE__, __LINE__); - } break; } From nobody Sun Jan 28 11:37:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN8Y50WJjz58Q87; Sun, 28 Jan 2024 11:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TN8Y473XPz4kpP; Sun, 28 Jan 2024 11:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dET5YkQJX5GxX1jd+bz7bQRuO4eUWZ8spv4zv8kbFBM=; b=NVmwPvZ/pEKFpJgysR2VDTBy5UB/lAP80RXQ6ZxOiEhIGm1h7n4dxjo3+SYzwpvQJjxAw5 leDQPOwCdKSgA+rIAjnXNquIolvyjJS28cmS0iqbdAi/oEAIJeP6hZEktQcnCI00my37s8 CGhta0Qq6JieETNlAWjMpm7RGZ+YLq4GOKUZbPR9zmrirIeilbQVkRtbBaxR+k+hFBvjgB Rr772J5wnWFCkm48FIrlOaPyxuzvOm2xZFawZDDtK1fuCrslnTuWt7g80Xhs+pTlBvZiQd DXhiv9aLCAwb6sUGkE5FNxim0YmkHj3FukQhNm2sqESl/NdE8gsMD7YAz+1cjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dET5YkQJX5GxX1jd+bz7bQRuO4eUWZ8spv4zv8kbFBM=; b=Z2gmUksm4TDTOU731M+3dW8K0+p8bZ7afYS9p2Uvr+k69hOxlKvIHWl6ofuZufp60H/jyU tPdcaP3ozWH2m6f6krCOXpq3mlV/cWcxQdMdqbl3y0gTdkmhGS0q3LGLtBreyg8204ltPA EYbJEaKu4REajkyqvO6u1dqdsWOrASy58t6OWAPrAIgZAsmbMQB97d4vzmPVHakkhSwXGj H19H50kr5wT9mhCKzndDoU9p4gubgk7Ok4r13wt0HE5/F+sJWEBBxvY5M1cIGJOFeOSzYH FROkv/KIg2UL10nRJwMVdZp7ooWHa9OPIyLMgyNE0VI448hnt45Owhz4UbNH9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706441833; a=rsa-sha256; cv=none; b=I+qvjITtZhtrFi/p0eShVQ23zYmWdUlAyyXbpOXQpuCBd7T8V4DOVSclArF3M1Mb2xnDxV YwtL1mt+/pVDwbO/VUzZ0PGdzSdBkLXPcQp+xpuUrVRAE+mPFgxaUUNLRCPCLt1YlfLgn1 x2Vr3PxkyeAJX/S3pNKg5NPYU2/R9lW+u4548b47XkhSMliWzk7zPcm/swYEfrNHbKQLYT cLiv/qxF/MN2y6Nhzpy4Wt3fQn4PPNtIJ0AXUmJFUATc83Yvr6LUmnrxzFPWWIKU/TzUAb MDnFC13T0afQsGPU3tu9y6QPKJRbndMat8Ov0T0oFNWoJSsm0am9o7pde6GLdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN8Y460vZz15kP; Sun, 28 Jan 2024 11:37: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 40SBbCbK070906; Sun, 28 Jan 2024 11:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SBbCM0070903; Sun, 28 Jan 2024 11:37:12 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:37:12 GMT Message-Id: <202401281137.40SBbCM0070903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 406e959d07c7 - main - rk_i2s: change interrupt type from MISC to AV (audio/video) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 406e959d07c78521fb755d94dc784d377f302cfe Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=406e959d07c78521fb755d94dc784d377f302cfe commit 406e959d07c78521fb755d94dc784d377f302cfe Author: Andriy Gapon AuthorDate: 2021-09-24 17:06:49 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 11:36:19 +0000 rk_i2s: change interrupt type from MISC to AV (audio/video) This gives a higher priority to the interrupt handling thread. We need it because its work (filling the hardware FIFO) is time sensitive. --- sys/arm64/rockchip/rk_i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index 6d3db56919d7..08fbbd7915bf 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -544,7 +544,7 @@ rk_i2s_dai_setup_intr(device_t dev, driver_intr_t intr_handler, void *intr_arg) struct rk_i2s_softc *sc = device_get_softc(dev); if (bus_setup_intr(dev, sc->res[1], - INTR_TYPE_MISC | INTR_MPSAFE, NULL, intr_handler, intr_arg, + INTR_TYPE_AV | INTR_MPSAFE, NULL, intr_handler, intr_arg, &sc->intrhand)) { device_printf(dev, "cannot setup interrupt handler\n"); return (ENXIO); From nobody Sun Jan 28 11:37:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN8Yc55B3z58Pv9; Sun, 28 Jan 2024 11:37: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 4TN8Yc4Z0Sz4l0C; Sun, 28 Jan 2024 11:37:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ybpZGYNWlE8sSuD1p2iCXMa4NQjdk1Kfx8uQyNnbtDE=; b=xLEAKhZdBWX1kUyrq4VHce6f6VsLECdPz73mDRZOeJ5Q7TLQbb3Dx75gklFGwmphisuKkS FsY/y1/3NvUfXjZcveW4u7IlmFDrAgmKQ5fVkbUVKLkbg1KvtnvZ5Lk7uSh/c7e28q5xHh J1VY51UCErB5d/igFUQidvJAVfWlxoyu/+w9Wt/97Mu6s2urH/ysWF9B2cTAK4IBu9LO15 s7Xg2CH66e9Fu0f2RGhkN7B+BhsyzjsBfIgIIBiumpak57C/NaiiQIZC3KrW1sBRY+SA+P loYebrLO+dH2fnUYVWG/aeX6NQcE0KSqyUdCh+OpPbfHWx9NDn8rczFrTuc0HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ybpZGYNWlE8sSuD1p2iCXMa4NQjdk1Kfx8uQyNnbtDE=; b=cSWT9WPa5wOo4Rlfcr0DC2K5LcCkYwJffnBqmYzXHgg8O37CXeRdAP3Bg/gwd6N4MF6Poq QXHbddCENgr7usD7lOWVCVWJKPSKY48RTkvE2lkV4KXPqAmSwm3802gO+Alej0QEvtIfk3 I9XbFYF3n3iFbOvLUSXMcqILys6kQJdHNNp6BA1l5vmeK/XkQgU6mG59q/p1190jhdZWJt 6lKZA/XO5y0AWPgFOCsZiq9gThysXxbknLnYN1WeoTXpv9zUn/YM7BTc7fDmQaaFN67kN1 PbIhVG/NFXTu39drHomQGjPzX+cOU7Uv1HecphUvHrfngjQFXlp0eo9aat6mIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706441860; a=rsa-sha256; cv=none; b=ILmHKF6BdS4eEE7ZMOY0DZz097QJC0XCQ37zJ2VG6CNOuq0iCr2aL8bH9IyrJfMILEHTjB jBmNYG82Rf4mJJpwxpuHBCe1Ps/tbkSPsU8SPepvxw3RB76RmF9PtqZs0rmHqV5fCZP/Dp o7CTfoq44k06EsXqnCeTg0H49jpSUU7Eb3sCkvFTwc/Xy613mGbJCPPe6NTMYM6/Yq3ZyV dAbk2BU5At4w2PR/fIORXv8U5ObhYKF5A0WJl4x6qpVsJqC/vpldE7ybetDUCMJL8PHOgB l9Lgr+i+AOqp+FpR0HLTPg82mlJdiv9n2vINp4A4E/9lPqWX8Egh6gHTXxvbHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN8Yc3dQzz15WB; Sun, 28 Jan 2024 11:37: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 40SBbeAi071103; Sun, 28 Jan 2024 11:37:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SBbeBU071100; Sun, 28 Jan 2024 11:37:40 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:37:40 GMT Message-Id: <202401281137.40SBbeBU071100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 89cb925fddac - main - rk_i2s: remove unused definition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89cb925fddac372f74068b9e57528090299032a2 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=89cb925fddac372f74068b9e57528090299032a2 commit 89cb925fddac372f74068b9e57528090299032a2 Author: Andriy Gapon AuthorDate: 2021-09-24 17:04:27 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 11:37:25 +0000 rk_i2s: remove unused definition --- sys/arm64/rockchip/rk_i2s.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index 08fbbd7915bf..3d6aaf523c4a 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -50,8 +50,6 @@ #include #include "audio_dai_if.h" -#define AUDIO_BUFFER_SIZE 48000 * 4 - #define I2S_TXCR 0x0000 #define I2S_CSR_2 (0 << 15) #define I2S_CSR_4 (1 << 15) From nobody Sun Jan 28 11:39:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN8bj4MTQz58PvH; Sun, 28 Jan 2024 11:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TN8bj3sR2z4lgZ; Sun, 28 Jan 2024 11:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D9KaVStlihf7vtnhucsi7eP9Rppfb7FaQBmTliq1T04=; b=j4MhV4OZ0F1OHFLWwbB+9tXdw0ax6uwVrsl0jcgrAetFyA70nd2MC01r+zXjrOORkHsgM7 2rEJgXIsJNGHZnC3D9QDNa4JFj0JYXoueNkDLCs4BLhhIGF2Ue5q2uu6IUIU2JLCtmFh9O dF9tv8r5x7RpCRU8Hvs09HpnM4VtDotIsG/S4QutV2sDmryg/0dW5/Z2gIvkgFoM87QVnn h4Ci7dkwMMlhQ85qhEVqjkFgWXhYd97kVD9tB5Z2yzlqdCGU0hNEzGuh1wr8wKgX7b/fz5 fXWSJi/a20lFma5yE5LSwXM3s5OfLz7mXL4gX7S0GvjBteiohLYmfWX12VDsxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D9KaVStlihf7vtnhucsi7eP9Rppfb7FaQBmTliq1T04=; b=DKjsHoGiNaM/RKOsa2m6Ed8nz7OQCjd0rY9E1rJfjUBDy15yDE8pG8ijNBw8mvfuLnIMuz EM8Uase3x+jszsbgnggKKu810iQAmEhjw9Q8PbUOAyytIIiPelbnEzGJk4QlJkbjKykyaY 04wgExLttaguYaPe7FhGRgIiVgz99KfPtVClNPrObMpVB0GWKrc5vrZefpVrep0b/fAojl OZuWqvMe9yV20yqSs9Qk5Eph8GHgrhB6ryJo0F4GhQP7l75IcA1UaVJlClOaXpueMuZ5ss azZabzhIrYOjXuUVh4pAEe+kMyeP55pMiuaBkAiB51/70DDWC2DxSmWeHy5Mrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706441969; a=rsa-sha256; cv=none; b=nEHkoYbDUigojr3Sqadq8bk87ktUagVbEyfBgKp9oXZRVeLvdGVEGd/9w2FU7LZFNmf/eN 9KkQf+9uaCRE8PoKHPS65PDuQOqPO51gin8qyd6y+bCHTVf79ZhSUdJYNb0WgsRkN1s88u Ld6oc5mzqXf7T9mXuKzw3iGhkAz5o1blKS8O8PyO21WaYNoco+jQ/gsTV9j+QWhMogmigf on2sP2DhvBIVuv1JYxQ+95LlUmgFLH+VzpZz4uycBu8I0sfVVnfkttqZnD9jL9GOhUvf0O C5xB8tkwFcH7s3jmPZzS93c/DjSXKrydJcfs9sTUAaY3V9Ha5zvV83keHT9gFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN8bj2vxqz15kQ; Sun, 28 Jan 2024 11:39: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 40SBdT1C071439; Sun, 28 Jan 2024 11:39:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SBdTHV071436; Sun, 28 Jan 2024 11:39:29 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:39:29 GMT Message-Id: <202401281139.40SBdTHV071436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: ea7f45d3d8d5 - main - dwmmc: fix a typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea7f45d3d8d5d41a9cded5765dea43ed215a663b Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=ea7f45d3d8d5d41a9cded5765dea43ed215a663b commit ea7f45d3d8d5d41a9cded5765dea43ed215a663b Author: Andriy Gapon AuthorDate: 2021-09-24 16:32:39 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 11:37:57 +0000 dwmmc: fix a typo --- sys/dev/mmc/host/dwmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c index fd55ce5c0cd4..8d67608c3977 100644 --- a/sys/dev/mmc/host/dwmmc.c +++ b/sys/dev/mmc/host/dwmmc.c @@ -878,7 +878,7 @@ dwmmc_update_ios(device_t brdev, device_t reqdev) sc = device_get_softc(brdev); ios = &sc->host.ios; - dprintf("Setting up clk %u bus_width %d, timming: %d\n", + dprintf("Setting up clk %u bus_width %d, timing: %d\n", ios->clock, ios->bus_width, ios->timing); switch (ios->power_mode) { From nobody Sun Jan 28 11:39:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TN8bk5n18z58QHn; Sun, 28 Jan 2024 11:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TN8bk4nblz4lKS; Sun, 28 Jan 2024 11:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vw+hbYtTNjMxQrSL7t2jNo0CqOtea7494JaxXhq6FIU=; b=cU1VkWwsOYU91iqcYJzQ7A2WQHjZ2CGc3ZxLawjnKzLGtb6FH9IPgJpm8tQnj7wUWI3aXv YfqMmTXTVogrPwXovSVr9EfnubB8AAOqC7s/WMjPv7PqXkkVOFqpAIOc+H8a+crAHhUcSb 8IdbwcKkHMzsFPY22Jmbf4ag7p7lenQtiOQU4Qxw31hOglZ65W9PFfmx9+qxVr1NfoVZLR etmlm2tnSfdR8fS1XpMHKi8KzoPA5wPK/vKPRG2SUb1AzZTv/QL2PnPhfu+sjNQLiOudiq cu4LYnWjIB+S78WRM0eW1p17c2JIrf9/e9XJkubESjNf+ayD0exaC4TL6WnreQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706441970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vw+hbYtTNjMxQrSL7t2jNo0CqOtea7494JaxXhq6FIU=; b=wnUTciJB/6pOP4wtIcQbJCn5vXgOiMgD5ZpZQmgaYMMHBqqMPht3kdFP2oVxY3WNP8HwgO PbdkazGJ7PSszP1NCoRVRBgH2zrwARTbKi0cSv7vXPkfduXN5cUY2SvA1QWJTJp107dEzd OuMT1ylR8Jo4+0L/RwSPHE4+l/PiRzfc3u6R2RvVzBzCUIisVoBs3n/QDqY3gYmQlIUy16 4NmEfPij1yamcchkJMlHCslUwqxdu7F/+eeeeRQzI1/27FmZ7Y/Yi2IjdPbD5vbsLqvW03 RT1zSAccx3AjizyhKn1c827C0vFxgniWn7mKfnjzrQ4DOd4lxmJv0OkMHhj3Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706441970; a=rsa-sha256; cv=none; b=cw2wHpLJ+dUiGz3h1uvg+8wje+lG2Byygmev8K1gUOPVii0N5REPWZ+0QG0RNBWpqidg9b qN3Pw39EUeqIM1lJ2SLWlAXh5jysv2OwfXD9l+b/l4UETEpIj114k6WLjKsLBeCmePd3Ef MuN+6UhhxW2fTa8oWQEPPdWdLvSf1lvtKlR9TFwXm/iZATDLWqEVx9yyzcARLdio/uX+5g Zf9U6oFdlC9y4jyheRc+6CvZ5XBE36I0fuzN9RymfSx+KMQV0QSDZbKhXqKLTuvDbFpt2Z 7etuoRCTjxNIdjayo3rtnbjVrg42NSezLtx2JgETQuEiFRFoPRSg1mj46f0KDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TN8bk3s4vz15yh; Sun, 28 Jan 2024 11:39: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 40SBdUIn071481; Sun, 28 Jan 2024 11:39:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SBdUcu071478; Sun, 28 Jan 2024 11:39:30 GMT (envelope-from git) Date: Sun, 28 Jan 2024 11:39:30 GMT Message-Id: <202401281139.40SBdUcu071478@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 43ca38eb59ff - main - mmc_fdt_parse: remove redundant bootverbose check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43ca38eb59ff194fb6d8ad589e74147d94717bf4 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=43ca38eb59ff194fb6d8ad589e74147d94717bf4 commit 43ca38eb59ff194fb6d8ad589e74147d94717bf4 Author: Andriy Gapon AuthorDate: 2021-09-24 16:26:06 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 11:39:03 +0000 mmc_fdt_parse: remove redundant bootverbose check --- sys/dev/mmc/mmc_fdt_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c index 0fb76dbfe522..752e5d14bcb0 100644 --- a/sys/dev/mmc/mmc_fdt_helpers.c +++ b/sys/dev/mmc/mmc_fdt_helpers.c @@ -66,7 +66,7 @@ mmc_fdt_parse(device_t dev, phandle_t node, struct mmc_helper *helper, device_printf(dev, "vmmc-supply regulator found\n"); } if (regulator_get_by_ofw_property(dev, 0, "vqmmc-supply", - &helper->vqmmc_supply) == 0 && bootverbose) { + &helper->vqmmc_supply) == 0) { if (bootverbose) device_printf(dev, "vqmmc-supply regulator found\n"); } From nobody Sun Jan 28 12:44:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNB2x09HQz58WZW; Sun, 28 Jan 2024 12:44: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 4TNB2w6mC2z4tN6; Sun, 28 Jan 2024 12:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706445881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MF3BkVf/QcB7OmoVHjcUX1duYcsgq2lEGqu2tgCDu2s=; b=AGowH9z1A2LS3yEcr87K8o121iS5tgOADqh6BpiZHvMOXlackf3MDiWm6cklBhVTGSG7VC rLEmpGnPtW4/AQM2SZ893ezRrjfcPRwGbb0gaY+LpKqUtZB2BF2UYjbJrdkwIeP6lnHUaf RdeG7Tg3kcTlk0oWA91hDH6N3A8KJ0e7w5D03hz1bhm0lokgBjju7wRXJwNvff0BGHyozy v1vX3/bE4nUcyEVZPqWLq7pn9lSQXlpCndcb9Q0G3bnTTZLYMJ3BShIDHmJ+z/Eoxifi6O QJg6pPbaZmEI8FY/xYXFm1BBPTU0BsUBaXl933q6Z0iNcckO+D1fHe6F3CiEWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706445880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MF3BkVf/QcB7OmoVHjcUX1duYcsgq2lEGqu2tgCDu2s=; b=OYeC+NjBhXhy8TIiPBISjR1QLrtUyQr+sO98oPW5i8+k+aNbvEgdR6hDHjbU/Cu3N1OsD+ 3p6fcXF8SaaAndG3f2lvzdDeeeuFCeFj0qPckt2VXyHOvZ2ytHuU4uOJjW1JakK5ZhO2dL ATdTN0gRg4dizTUQNFOU6QbrUZE93Dfx7Tg/F+D56g3Q1nRysLX0L29Vhr9gimviF7DXdU Mj2FsIhDgEdpcr7RHDHq5cqOzPiPvaaBw04uFEKs9BH5kALsvitUI7qLT8W+NElTeargm9 6PPHu4UIBwkVdVSyBXKi3siksfshkazZ3S+2W/GJQ2sseUJ5y17/GJXOCJJK1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706445880; a=rsa-sha256; cv=none; b=rGqy7+pZJeBAhYOHDS4q4VlC3nkfy4a8tAUaSD/hV0wktMkX1JPa5XSpgBLFhhSckQWYqs Yoh/AP4Y1s2fGwxDN7CC+dJP8lrWDtnfZ0+eJ0Ipy6Zmyhq2Y363CJQ1ZYSkrXHQBWP5Q1 LDwDf2kDRyUF1UXrW2gxuksc/+z84G3AWBPUD4/ZqOv8flu+zm7vUbe98BprlD1w2nQAE2 WPn5QGfCTgbV4bb6l402i9UMZ9D94b38bXLZw24WNEK+kty1pDoDGVsNsHH+VPj9BDyJI6 wh6XQYZIizqoiBKBw+unpfmh8c60j1owFV4yBuGYwzAdDRVBDZIyiZcZk8pjQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNB2w5pWlz17Dd; Sun, 28 Jan 2024 12:44: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 40SCieD0088741; Sun, 28 Jan 2024 12:44:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SCieRk088738; Sun, 28 Jan 2024 12:44:40 GMT (envelope-from git) Date: Sun, 28 Jan 2024 12:44:40 GMT Message-Id: <202401281244.40SCieRk088738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 90dc7889825d - main - fix signature of ipmi_shutdown_event List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90dc7889825d13290955d0eb7e1fb4388c0a0135 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=90dc7889825d13290955d0eb7e1fb4388c0a0135 commit 90dc7889825d13290955d0eb7e1fb4388c0a0135 Author: Andriy Gapon AuthorDate: 2023-01-03 17:22:21 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 12:44:13 +0000 fix signature of ipmi_shutdown_event The function had a signature of watchdog_fn while in fact it is used as shutdown_fn. --- sys/dev/ipmi/ipmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c index c9ebb5aab2bc..06b0760b002c 100644 --- a/sys/dev/ipmi/ipmi.c +++ b/sys/dev/ipmi/ipmi.c @@ -753,7 +753,7 @@ ipmi_wd_event(void *arg, unsigned int cmd, int *error) } static void -ipmi_shutdown_event(void *arg, unsigned int cmd, int *error) +ipmi_shutdown_event(void *arg, int howto) { struct ipmi_softc *sc = arg; From nobody Sun Jan 28 12:47:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNB6j4ZT5z58WyT; Sun, 28 Jan 2024 12:47: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 4TNB6j43cZz4tXR; Sun, 28 Jan 2024 12:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706446077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iSoJpdhxrLZe0rRGxsDQaIyOjupsvjWonYhTuvn3EqY=; b=u4N8Dxs3d+JZjPi3W8wTYtGw6UKcAQfi9jCt2Q+UCXJ03C1ohwucVYnIpLsmxc+UeRNgw+ Rd1JZ7KVkVsXDbsbUwrORg4FZL9nweq+pwmr4s5bYz1PZrtpnCVHCgFyz8WiQsSH3kpcou IZDFvhzT51a9s73ru75H3trH7ou1ACYSPck0zlT0PVjXQDlGccsyiHHLUOvtl03l5WNj1C pd7IxBDG0LT8PHPc+OM4635Vx8hGI4yDop95US/LrUXPVeY2fibhS9n7hYJM01IQ/pPeOG /PtVjYJ5JEdfGOHsDSXJLPWVrzPiPXdhw/zULe4+a18Ry49UHqTk4qhL67eBOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706446077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iSoJpdhxrLZe0rRGxsDQaIyOjupsvjWonYhTuvn3EqY=; b=eHsTgL3oyiCpIx4QlnuriP8KvU8GFvHwSgjIovNYFKMu4BAeaGgxNV6PB3NYRGedyfGPoy vjWESGJ70S0jYDdC42PIf67IqXfVjowA6IoDGdm3lmGcE6Dgx9jL4bhMrU+Yq/xREkJ4B9 kESiRQVSkPyf38sMFQQKbVB8uZBd9jqvh7UZJrk3PQ/hK/zNX0AKoFUgEO6/vYKqslS5zz ax0m7co9ha8owyJyh73gbil/yKbF5iiie0wG4wbU2D6LbmffmdaA4nsriGC986vMUx13Te yvLGjvt/2BtFxwq+xfoCw1ix8dE+4FxqH77PlSrbNmtFgbIlphc7e3Jkb8TDoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706446077; a=rsa-sha256; cv=none; b=lOPziIlOK6y51aweKyphlx8Xg1ijG3RZtFKBUxU1hxIBizinSCEI3a1o+gCeOIYVDhjzxp BLwpt1RK+uQebbgVQVK79FprkuiRka7jjpx+sKTy+TgJwwI/+7lz+U/C4YeXxuITzS8Cbe VebHwMeeeO1DCQSwmF3N+JoYQ6ZN6TsrCdxm4Xp6yFAzCae1luUxn6emP3wkxKHJRGJoXc gKnwecSHF3uPBmy7st5oTeu8EOR8DAQNEulgX5DFfcWU8M22SxnNzwgCtLpDZ+otbZtq/q AmTwnHVVDas1ERXHCpnU/blJZc5xh1LdTvr2C5GBFrkFhQatwVbgyoxtu+hCNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNB6j35XTz17SP; Sun, 28 Jan 2024 12:47: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 40SClvR5089336; Sun, 28 Jan 2024 12:47:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SClvua089333; Sun, 28 Jan 2024 12:47:57 GMT (envelope-from git) Date: Sun, 28 Jan 2024 12:47:57 GMT Message-Id: <202401281247.40SClvua089333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 8fdb26160160 - main - change ipmi watchdog to awlays stop when system is halted List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fdb26160160c4507eb2f644a982a3e05984cdf6 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=8fdb26160160c4507eb2f644a982a3e05984cdf6 commit 8fdb26160160c4507eb2f644a982a3e05984cdf6 Author: Andriy Gapon AuthorDate: 2023-01-03 17:26:45 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 12:45:16 +0000 change ipmi watchdog to awlays stop when system is halted That is, wd_shutdown_countdown value is ignored when halting. A halted system should remain halted for as long as needed until a power cycle, so the watchdog should not reset the system. --- sys/dev/ipmi/ipmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c index 06b0760b002c..efb8a7e7669b 100644 --- a/sys/dev/ipmi/ipmi.c +++ b/sys/dev/ipmi/ipmi.c @@ -766,6 +766,10 @@ ipmi_shutdown_event(void *arg, int howto) * Zero value in wd_shutdown_countdown will disable watchdog; * Negative value in wd_shutdown_countdown will keep existing state; * + * System halt is a special case of shutdown where wd_shutdown_countdown + * is ignored and watchdog is disabled to ensure that the system remains + * halted as requested. + * * Revert to using a power cycle to ensure that the watchdog will * do something useful here. Having the watchdog send an NMI * instead is useless during shutdown, and might be ignored if an @@ -773,7 +777,7 @@ ipmi_shutdown_event(void *arg, int howto) */ wd_in_shutdown = true; - if (wd_shutdown_countdown == 0) { + if (wd_shutdown_countdown == 0 || (howto & RB_HALT) != 0) { /* disable watchdog */ ipmi_set_watchdog(sc, 0); sc->ipmi_watchdog_active = 0; From nobody Sun Jan 28 12:54:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNBGl3c7Fz58XKh; Sun, 28 Jan 2024 12: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 4TNBGl2llcz4vfJ; Sun, 28 Jan 2024 12: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=1706446495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpX3nKUk6vgqOb0zYbGp6FBsS5exo+BXsHYW8XOnG3M=; b=bANQ7CoPq+BVb26FEXb2JH9MAMwan50BQimH4F3yfwzdipkVlhducf1VZadTSO1++h0Nqj ANuwCZY9r/BsOfLIMrsaF9WDHP4IxMSZuRDOVXJw3Rh1jCXcp0HOp2xDrLREQzyVldVbqB d+WJyh3BedZxd6WJmqtREQJ3kcuuXHfdIPqpPhWPfSLhHSDSV1I5FbkHrs2vuzpc7oFo0e bxa1GkLaKh9dWfpwZ011DV0p07FUPLVoj0QlgCYfmHBYC1HG0h0JiVBI6ieO8/nyBHzBbE nKKba9IW9k0DNJmoikgvYcWYAfEth7lyKt4IQvwb/5/bBJnAl2CkPRF1bo/1DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706446495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpX3nKUk6vgqOb0zYbGp6FBsS5exo+BXsHYW8XOnG3M=; b=e6JIH1s3qB+cJLk7jk0qwUwyhzkzQfwab+nidzwtqwD1Jd+KBH+I+zltq2P6Bm3RpnlyhB QDurpb6A2/HD7C+nXELYrtk0BjknW/Ah2g04rb+rhZ/595gpR+I66dwQz6oR9N+PM0DvH/ 7kjg+XZw5fbK+0B3mtSp7QQVtxaFmBnf7IfWmgTaUc4i/8EYWh2Hw9nATt2AWG/UT020L0 UuUvdXO/Ksnn8HqhHvODY2SgtslOvEuh1VxFx/nO+BMzjRMzFOjdpCy5JAa22Wfj5brKWY AEuKJXfAyqSdlpcYJHSLGj8xTLdH1jy0K/rcOIKS0DlVV9UQkPngP4e11D0p1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706446495; a=rsa-sha256; cv=none; b=oaV634bXPNKugSWte7uGC3AudgppZo2ESIPjrsCP3ZRcFePcsfWyPcavCfV7Uox4kswEiX Iz+35mJwSX6f6ctQROt5H0mwVHjFl5K93Z59VdObuU6pA9rO4OF3Zu5SGDra19D7DGkHp8 SRa/qa75z9wmk4lK3SmL7HjEbwBrkSkxri1kJH0rg4jOqKuSpUiaT1EWB2+sSbFTBBRFk/ eWSlzuT2utcqoD0JdVdVV2F4R3xFSvOvnUI1aKQgoSqRKIhFdaY9MO9osdyRtz01A/VwOu ee8Ntcj8wJjDl6jOOTxbOXeb5G4pcV25Mbd0/xrURoVOgp0kXQCL4J31SUU2EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNBGl1msGz17jS; Sun, 28 Jan 2024 12: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 40SCstRr005204; Sun, 28 Jan 2024 12: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 40SCstTd005201; Sun, 28 Jan 2024 12:54:55 GMT (envelope-from git) Date: Sun, 28 Jan 2024 12:54:55 GMT Message-Id: <202401281254.40SCstTd005201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: cbf7c81b608b - main - ichsmb: fix block read operation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbf7c81b608bb9311e50df9481447dc843083a0e Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf7c81b608bb9311e50df9481447dc843083a0e commit cbf7c81b608bb9311e50df9481447dc843083a0e Author: Andriy Gapon AuthorDate: 2022-09-13 21:26:35 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 12:54:19 +0000 ichsmb: fix block read operation First of all and unlike I2C, it's not the master that dictates how many bytes to read in block read operation. It's the device that informs the master how many bytes it's sending back. Thus, for ichsmb_bread() the count parameter is purely an output parameter. The code has been changed to reflect that. The sanity checking of the response length is now done once it (the first byte of the response) is received. While here, handling of ICH_HST_STA_FAILED status bit has been added. Plus some code style improvements and some new code comments in the vicinity of the changed code. --- sys/dev/ichsmb/ichsmb.c | 61 ++++++++++++++++++++++++++++++++------------- sys/dev/ichsmb/ichsmb_var.h | 5 ++-- 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c index 7405f625e69f..94fc03d2bc67 100644 --- a/sys/dev/ichsmb/ichsmb.c +++ b/sys/dev/ichsmb/ichsmb.c @@ -389,8 +389,8 @@ ichsmb_bwrite(device_t dev, u_char slave, char cmd, u_char count, char *buf) return (SMB_EINVAL); bcopy(buf, sc->block_data, count); sc->block_count = count; - sc->block_index = 1; - sc->block_write = 1; + sc->block_index = 1; /* buf[0] is written here */ + sc->block_write = true; mtx_lock(&sc->mutex); sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK; @@ -413,26 +413,23 @@ ichsmb_bread(device_t dev, u_char slave, char cmd, u_char *count, char *buf) const sc_p sc = device_get_softc(dev); int smb_error; - DBG("slave=0x%02x cmd=0x%02x count=%d\n", slave, (u_char)cmd, count); + DBG("slave=0x%02x cmd=0x%02x\n", slave, (u_char)cmd); KASSERT(sc->ich_cmd == -1, ("%s: ich_cmd=%d\n", __func__ , sc->ich_cmd)); - if (*count < 1 || *count > 32) - return (SMB_EINVAL); bzero(sc->block_data, sizeof(sc->block_data)); sc->block_count = 0; sc->block_index = 0; - sc->block_write = 0; + sc->block_write = false; mtx_lock(&sc->mutex); sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK; bus_write_1(sc->io_res, ICH_XMIT_SLVA, slave | ICH_XMIT_SLVA_READ); bus_write_1(sc->io_res, ICH_HST_CMD, cmd); - bus_write_1(sc->io_res, ICH_D0, *count); /* XXX? */ bus_write_1(sc->io_res, ICH_HST_CNT, ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd); if ((smb_error = ichsmb_wait(sc)) == SMB_ENOERR) { - bcopy(sc->block_data, buf, min(sc->block_count, *count)); + bcopy(sc->block_data, buf, sc->block_count); *count = sc->block_count; } mtx_unlock(&sc->mutex); @@ -515,21 +512,35 @@ ichsmb_device_intr(void *cookie) /* Check for unexpected interrupt */ ok_bits = ICH_HST_STA_SMBALERT_STS; - cmd_index = sc->ich_cmd >> 2; + + if (sc->killed) { + sc->killed = 0; + ok_bits |= ICH_HST_STA_FAILED; + bus_write_1(sc->io_res, ICH_HST_CNT, + ICH_HST_CNT_INTREN); + } + if (sc->ich_cmd != -1) { + cmd_index = sc->ich_cmd >> 2; KASSERT(cmd_index < sizeof(ichsmb_state_irqs), ("%s: ich_cmd=%d", device_get_nameunit(dev), sc->ich_cmd)); ok_bits |= ichsmb_state_irqs[cmd_index]; } if ((status & ~ok_bits) != 0) { - device_printf(dev, "irq 0x%02x during %d\n", status, - cmd_index); + device_printf(dev, "irq 0x%02x during 0x%02x\n", status, + sc->ich_cmd); bus_write_1(sc->io_res, ICH_HST_STA, (status & ~ok_bits)); continue; } + /* Check for killed / aborted command */ + if (status & ICH_HST_STA_FAILED) { + sc->smb_error = SMB_EABORT; + goto finished; + } + /* Check for bus error */ if (status & ICH_HST_STA_BUS_ERR) { sc->smb_error = SMB_ECOLLI; /* XXX SMB_EBUSERR? */ @@ -558,6 +569,18 @@ ichsmb_device_intr(void *cookie) if (sc->block_index == 0) { sc->block_count = bus_read_1( sc->io_res, ICH_D0); + if (sc->block_count < 1 || + sc->block_count > 32) { + device_printf(dev, "block read " + "wrong length: %d\n", + sc->block_count); + bus_write_1(sc->io_res, + ICH_HST_CNT, + ICH_HST_CNT_KILL | + ICH_HST_CNT_INTREN); + sc->block_count = 0; + sc->killed = true; + } } /* Get next byte, if any */ @@ -568,15 +591,17 @@ ichsmb_device_intr(void *cookie) bus_read_1(sc->io_res, ICH_BLOCK_DB); - /* Set "LAST_BYTE" bit before reading - the last byte of block data */ - if (sc->block_index - >= sc->block_count - 1) { + /* + * Set "LAST_BYTE" bit before reading + * the last byte of block data + */ + if (sc->block_index == + sc->block_count - 1) { bus_write_1(sc->io_res, ICH_HST_CNT, - ICH_HST_CNT_LAST_BYTE - | ICH_HST_CNT_INTREN - | sc->ich_cmd); + ICH_HST_CNT_LAST_BYTE | + ICH_HST_CNT_INTREN | + sc->ich_cmd); } } } diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h index abef219465e6..7fb14804d3c4 100644 --- a/sys/dev/ichsmb/ichsmb_var.h +++ b/sys/dev/ichsmb/ichsmb_var.h @@ -58,8 +58,9 @@ struct ichsmb_softc { int smb_error; /* result of smb command */ int block_count; /* count for block read/write */ int block_index; /* index for block read/write */ - u_char block_write; /* 0=read, 1=write */ - u_char block_data[32]; /* block read/write data */ + bool block_write; /* block write or block read */ + uint8_t block_data[32]; /* block read/write data */ + bool killed; /* killed current transfer */ struct mtx mutex; /* device mutex */ }; typedef struct ichsmb_softc *sc_p; From nobody Sun Jan 28 13:14:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNBhn4J7Qz58YxN; Sun, 28 Jan 2024 13:14: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 4TNBhn3p7Pz4ybL; Sun, 28 Jan 2024 13:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706447641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LiSoJDSkJVtrbpEU2K+i3S5qaIwSq7ClYuJAy9xrqpE=; b=sW/qIdyVlUH9W9izl1KkW+Zc6MlAqlzipFwKqQTe6Oy7m6vzH8FoyHodD2TFu6WqOAJmzz N+WodiUGsPjOPzM1Q7B/Pu3Ov3wsZfgCiNOWITxqQxTX9PJefqcBw1FqGRiHSLeVXBV59L 5yuJ63S8NxoOJN5iyPhV8VkjcfWLvRqsjio849/Y6bGrI4XIx4DAXevS8j6OoWK7PMrzDL sBaKCRrWuAkFz2yGtRQ4FyEEZG0SCORRV49/NMJpotSjWT+vzz8RBBHq7ymVk8pMa17cny oM11jnOfx+G5XLlMDtEMutihM2RoMI0LIvyl5bqIQqjGwuujQWfH4fvCAFtuhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706447641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LiSoJDSkJVtrbpEU2K+i3S5qaIwSq7ClYuJAy9xrqpE=; b=YSvvKb8FgMv9bNy7Il/L3h8BiO8+T/DxdMILirFdmRRqqLEg8gPgT9Xi8Q5W+PPcAc4qvf VvWyvjojnA+KXPAX4RH6cDH/lwqodPM+XiiYmIPDHY4uc1Acmugujb9cqG1lXf1DgWbqZx Nbq1IoCri6qHTwA42jtYSMskaxfYJhnsHsPLSLfipUdkAsG31rruZfCqF7mpvE0dHG5w0T CVtNP24EvHKvbe3lOGgqYLWkr9VVX3c2mTs8/+Fwy8kBLHowtGSmG4eEm9OK+yullsS5ko 206ZMbwZRmNOsPT4sSlFW45ngSUEz3EMoCsOOanYOdul8mDWfn6gaWdbWpGCqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706447641; a=rsa-sha256; cv=none; b=iyIhR/80N3XVeGN+JwPHrOo802wsv+RIPrHbdWX2uDScC80my1/s3Wka8rP92g+ybs/YSf j3OqrMY9Ee+MyybJswggCLUoa5a+2qvODIAXKIO1LkS1daMghLL3nqjb4NbW++T7n9W9XN pC3Ivh062nWRKs0mckezOyOIntapdkgmiub9GX1sfBPFWuXq/zB5YAQVpZ7Goq2IUoBcNL zV1jbg9ds6jKlqaPtfKEGvNCXp3AekFaVt3IX8ghkDjtOKWGffSku8CFFA8EkPVeqy54a8 gxYAJfNxB1SwDMULJoJ2T9TDUOUavB9w8h13mTCxWBjzQyJ2RUVDljNaqklHaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNBhn2vGDz18RM; Sun, 28 Jan 2024 13:14: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 40SDE1Ev039743; Sun, 28 Jan 2024 13:14:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SDE19b039740; Sun, 28 Jan 2024 13:14:01 GMT (envelope-from git) Date: Sun, 28 Jan 2024 13:14:01 GMT Message-Id: <202401281314.40SDE19b039740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 9cdf326b4fae - main - run acpi_shutdown_final later to give other handlers a chance List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cdf326b4faef97f0d3314b5dd693308ac494d48 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=9cdf326b4faef97f0d3314b5dd693308ac494d48 commit 9cdf326b4faef97f0d3314b5dd693308ac494d48 Author: Andriy Gapon AuthorDate: 2021-12-20 11:01:56 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 13:04:55 +0000 run acpi_shutdown_final later to give other handlers a chance For example, shutdown_panic wants to produce some output and maybe take some input before a system is actually reset. The change should only make difference for the case of system reset (reboot), poweroff and halt should not be affected. The change makes difference only if hw.acpi.handle_reboot is set. It used to default to zero until r213755 / ac731af5670c7. --- sys/dev/acpica/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 9196c446ae80..7d1fc10afb9e 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -675,7 +675,7 @@ acpi_attach(device_t dev) /* Register our shutdown handler. */ EVENTHANDLER_REGISTER(shutdown_final, acpi_shutdown_final, sc, - SHUTDOWN_PRI_LAST); + SHUTDOWN_PRI_LAST + 150); /* * Register our acpi event handlers. From nobody Sun Jan 28 13:15:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNBkk1gnjz58Yrj; Sun, 28 Jan 2024 13:15: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 4TNBkk12q1z4ytC; Sun, 28 Jan 2024 13:15:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706447742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oc54fdl++sb1F1l5d/8ZfFj0L+ESTo66thaH1+T5LNs=; b=ltG5lz80vtltnqsUC9O58sdlgkvsESStuPDWV1q1DFYYKbJ/2QK50MomG9xtPv81bY0LWi GL1VthJ00kBqznxKBw0iyEzJFTMgOn7cg+58nhae925+6zGqSoqyx5OK33mROHUj7YA+Ug QZ9soCe7SciXJ4mTvszgwKJm2ncTB/UtPtyncWZw/Au/Ug2Vpci1t2sJPApEbcWEFf0fq+ 654nGWJdoVE/7vM5LwGS0Hqx/8g26zHcdXrLzX/Xr6sANeRCn5cYZRdpDQm/b8BgGOou57 qs3JFWjKg1vYDTilBH3K+GWci3viBFp8iR/pvN2i9gRblwP+FRMHRPFmWefJ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706447742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oc54fdl++sb1F1l5d/8ZfFj0L+ESTo66thaH1+T5LNs=; b=T5ROuBVm+vC7FCvch/NGimt+OeTv93gS82RJ5iiWbM9m+ocJGXPTAM3Sj02Dd9WjBTzd29 fxt/OXY1bGrYmyUvyJ7RqB2U2Qyxn5+GHZUivTd3mMO+QkxsxcquUrcu+KLwO2vWVWGYwj qrNHvONUQaowed84ebnlF+eme9YshI+zD+JgW5Z4wdvxjPmanFqlGliArbPzWU2HkSVh8V 37ZYym/mDJSaCGwRlEUv6GC9/TonEZUSzfixWWPVtZHXGsf44aj1bmZrHx1dZyS2QC1iuR UrPc1J1U5Xz7/suHErjLPvFsKLRy7GGXuro0b24RdtLG44FhdLbUAsLRgj0HZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706447742; a=rsa-sha256; cv=none; b=sqzBlFyG56pRdJnWceqon2Kz3B/GBpED7OYu3sztGhNUm7Y7kSKhM7XXLA2vQB40fotHRR sdz5T5Ua7h/7tawQiVbeBbCz76EWRGOorm9Dtnak9faWWKmjh8yYjAkBEmb9xxMq9oUZ/q 7RnQMQb10Z18Q5cmsXwc5FxAlDt0n5k81o8YOxsCODUS2absW4ZJQLRdkW+TkxNAXdl/zU d87dA9+C38KK22CVlxZd9vI+Pys2ywTaYQjr46F9PJu1L0dNwdZtgQcKW0vTLIAnf9/ifg zDSRcbr2ZxBDv/JO2fSE4QCK16EvetYzhSdv3AYIhcUnN8yAecDoxabzhsZpHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNBkk05lHz18TS; Sun, 28 Jan 2024 13:15: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 40SDFf97040154; Sun, 28 Jan 2024 13:15:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SDFfC8040151; Sun, 28 Jan 2024 13:15:41 GMT (envelope-from git) Date: Sun, 28 Jan 2024 13:15:41 GMT Message-Id: <202401281315.40SDFfC8040151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: e92491d95ff3 - main - dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e92491d95ff3500e140eafa614e88ca84ffb0d26 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=e92491d95ff3500e140eafa614e88ca84ffb0d26 commit e92491d95ff3500e140eafa614e88ca84ffb0d26 Author: Andriy Gapon AuthorDate: 2021-12-24 09:38:38 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 13:15:17 +0000 dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag This should disable allocation of the second per-CPU principal buffer which is never used. This will also enable additional asserts for buffers that are never switched. --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index ce02676e0dc1..83c0648b23b1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -12058,7 +12058,6 @@ dtrace_buffer_switch(dtrace_buffer_t *buf) hrtime_t now; ASSERT(!(buf->dtb_flags & DTRACEBUF_NOSWITCH)); - ASSERT(!(buf->dtb_flags & DTRACEBUF_RING)); cookie = dtrace_interrupt_disable(); now = dtrace_gethrtime(); @@ -14866,10 +14865,10 @@ dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which) if (which == DTRACEOPT_BUFSIZE) { if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_RING) - flags |= DTRACEBUF_RING; + flags |= DTRACEBUF_RING | DTRACEBUF_NOSWITCH; if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_FILL) - flags |= DTRACEBUF_FILL; + flags |= DTRACEBUF_FILL | DTRACEBUF_NOSWITCH; if (state != dtrace_anon.dta_state || state->dts_activity != DTRACE_ACTIVITY_ACTIVE) From nobody Sun Jan 28 13:19:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNBpw342hz58Z4j; Sun, 28 Jan 2024 13:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNBpw2YZrz50Yr; Sun, 28 Jan 2024 13:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706447960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E0HymIyoXZGduHs4uMtIPNy9CsA2n7CotPYVlnn2KpY=; b=kZVxiZk6XL7JC6IzT7ZqDFkacG9z/DcdtfYr2nDBi3MYfbJoSj12SIWKgjlzwF5rx7KkPU 07cashEt8t1a5HP7i0QJytY4hs20EurSMOHaz6fwdGPfRKkyklXaEUGqWh8lQlpFE0teBS sqDt7xhyNgHDptNN9fAyTlZp/M8mXid64B6ZnnbjasTnqhrH+YqyJY+XVmiCu58Wz9pto+ WlIMlkLYHsGoUP5gQ7YnfmDQ3GzPNpzYW2TW1Aym3vSMIVHYTloficvPTEF0gfGxc476hT vauwvF4SM8H7fBcyALwEgBQFNatdDo0DpEPpyn8xlFwsuoVuEfHZgCYKi6ehgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706447960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E0HymIyoXZGduHs4uMtIPNy9CsA2n7CotPYVlnn2KpY=; b=RjnmUgjYHvPGUTvod7tvrfsGfYRsautiSVhQjRWDkRmx7Yno2/7QM05KPrJWhMKeJ6ysuD fUxLSk7B+y9zRIQ/xnvXWs//89FTuHQmkW9JVXYRNfeGhvZ/pgOCxFDSjef6E8SZvcvIbj Aa+uU4r+kP75U9R/azpUqN+ZJ4WFbQHTPjVs8B0YOSbNDVhgW6P2RS9J1HOXxWyT56y8ry 8doT6X4ASRWQuR6SPU0BPLaD5avvkqJ1fWLfBXXi2ZN102jKSuUiq8TaXw0aExbU8YWcIf e/fcGvX/KL05g+MRqu2yjGokrVW4xlzGYieO62RVyKvBFFZ1IxGssBoEB/orLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706447960; a=rsa-sha256; cv=none; b=eIiJNi9pfD4o0UuGbC9MSl5pm9L2MucdvSzedk+XeLjPpg9YtgYYs6zzBnha7vmdXu6uX8 +Tk2moNY3g4f5bvuauBr9sHPvEC3pF5uHrDZwYP0RGr88103cj6Ps1RMQIiqmZBf8UTFDA 2dmRY9bh17uRShU5CT4eygEgMSfIpj+0RtYflC3L1MRBncnkzMftraXCpm4XCbFQFTfkjg JC3cYRYxjAKfoK3eH23vmyf1S5aTSpMMJc95FyAATzIm2Z3dvzPFa7kLVs3YZxMZCAA8X5 +2PkOgk15v2QhmBP40BiDHwDmZ+K0iVKYS0iGYyg8euQmDTv2vpUhPu2IYZmlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNBpw1XHDz183r; Sun, 28 Jan 2024 13:19:20 +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 40SDJKv3040859; Sun, 28 Jan 2024 13:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SDJKvt040856; Sun, 28 Jan 2024 13:19:20 GMT (envelope-from git) Date: Sun, 28 Jan 2024 13:19:20 GMT Message-Id: <202401281319.40SDJKvt040856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: c053a56c0f5d - main - hdaa_pcmchannel_setup: do not advertise AC3 8+0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c053a56c0f5df6db5223316831142e1d8afff64f Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=c053a56c0f5df6db5223316831142e1d8afff64f commit c053a56c0f5df6db5223316831142e1d8afff64f Author: Andriy Gapon AuthorDate: 2024-01-28 13:18:02 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 13:18:55 +0000 hdaa_pcmchannel_setup: do not advertise AC3 8+0 The rest of the sound system supports 7+1 maximum and is not aware of 8+0. I believe that these messages are caused by 8+0: kernel: feeder_init(0xfffff801f935d680) on feeder_matrix returned 22 kernel: pcm0: feeder_build_matrix(): can't add feeder_matrix --- sys/dev/sound/pci/hda/hdaa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index 02f4babcd331..dcd10cb36510 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -5426,7 +5426,6 @@ hdaa_pcmchannel_setup(struct hdaa_chan *ch) if (HDA_PARAM_SUPP_STREAM_FORMATS_AC3(fmtcap)) { ch->fmtlist[i++] = SND_FORMAT(AFMT_AC3, 2, 0); if (channels >= 8) { - ch->fmtlist[i++] = SND_FORMAT(AFMT_AC3, 8, 0); ch->fmtlist[i++] = SND_FORMAT(AFMT_AC3, 8, 1); } } From nobody Sun Jan 28 13:20:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNBrp64lvz58ZFC; Sun, 28 Jan 2024 13:20: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 4TNBrp5K3Lz51DX; Sun, 28 Jan 2024 13:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706448058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bm2jPUhvJPoArOJxJAejge5L6KZxvlW8OHQUDJVZxOQ=; b=htXFN2Zs02a9rtvfWmFjUCeLBhRei1F4VFoflqFACt6mhE4urGONPDeRD7tVxV21L6UpWb S99m1YILZNPucHgAPNs3a/4iEQ1yhwq2N4kgBJlNggvIFP+pZ04vDOsnQRrIIyle0/DJEF pMVKng2iW7dQdYx0L7eKvdbMaOSsw1WlU1ITXPPkj0yIGoeT2iw5Z6cqeo9s9MOi/5nZ8Q W4wlWPCVJig0rb5FCv762qtPbDV1Zhr+CDXPyAkLcje0kzW78vvinIWvQvBYiBCUA0/Z4b 2a8lEsp3bnysMsAsf0vKJhp4qs3LCRDYx8GaoWsmFQQh8T/WElRSr9wZKMX1vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706448058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bm2jPUhvJPoArOJxJAejge5L6KZxvlW8OHQUDJVZxOQ=; b=YvzBSZpbMiAaEUYHUI0324YgbUaIiVBe7yRCwZJo1BiPxLOMgpnRLpvFE2IGuCA8wnt4X6 6KQqlf88XfTGfkN+8tAAy+T+F1UkeWOjc2JwQqjrrRexVaLbjrd78+EEcXgoGXhaU8O2UG R+MM6yREa1MTkYvXa8xpY7oTlF/PwZiKhvytWNfpTR2WBT6LH8BRx/jjEdLc/L2p91xQyF IMT7rPOt6VGK8Y+blJIwC51I+qB0hTEOT73LZd9v10VCzuVsI3EcwTLIvP51xKNJcGH0+a vrm2Nr3N0yp9iR/PS0aICYrKO3J4aRKXcAx3Sr2wZJK0TTe1FJiTs04oWJnscw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706448058; a=rsa-sha256; cv=none; b=v52O4a0k6wnoFCPRt/0EmDHlyLPij7xnw3Lw1c/x4AWoo+9X+rzvH+13EF1Syn6XyTBknT L58lOkfkeYjovgAZUd6DLEGorEoS6RcQf7TOCP3bUDWmm7XN01GLoa0T4wOr5imUXlbXyW /2rYV2ljMsND7+ITGCLqtt4+GV9o1RCFQ5jHY2qYKrH4d+BG9KN7wAEdfP0TJl4Cd5eIhs ctyKCGOi8vUxFWurg9DlcKUtZWp2lXWOdcwyA0Ed4Ddz6+MT/0tjzn2e8eCTW3zSKywQ4z DYbc/T9/nx7kn5x+TFvEJ/H5yEQ6sE53zjiVSzub0hM1IE2yjzes+i/ZgBIFpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNBrp4MYrz183w; Sun, 28 Jan 2024 13:20: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 40SDKwfX050640; Sun, 28 Jan 2024 13:20:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SDKwXt050637; Sun, 28 Jan 2024 13:20:58 GMT (envelope-from git) Date: Sun, 28 Jan 2024 13:20:58 GMT Message-Id: <202401281320.40SDKwXt050637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: bf87d4a4bfaa - main - efibootmgr: fix potential endless loop with -v List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf87d4a4bfaa86e97079754e93fe14595adf07c5 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=bf87d4a4bfaa86e97079754e93fe14595adf07c5 commit bf87d4a4bfaa86e97079754e93fe14595adf07c5 Author: Andriy Gapon AuthorDate: 2022-10-25 21:10:39 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 13:20:29 +0000 efibootmgr: fix potential endless loop with -v I observed the problem on a system with fairly old and, apparently, buggy EFI implementation. A list of boot devices had an invalid trailing entry. efidp_size() for that entry returned zero, which means that the code got stuck looping on that entry. --- usr.sbin/efibootmgr/efibootmgr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index 4a6a7fdfec39..7bcb4674586b 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -790,6 +790,8 @@ print_loadopt_str(uint8_t *data, size_t datalen) */ indent = 1; while (dp < edp) { + if (efidp_size(dp) == 0) + break; efidp_format_device_path(buf, sizeof(buf), dp, (intptr_t)(void *)edp - (intptr_t)(void *)dp); printf("%*s%s\n", indent, "", buf); From nobody Sun Jan 28 13:21:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNBsp1QXGz58ZFQ; Sun, 28 Jan 2024 13:21: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 4TNBsp0dVlz51Mp; Sun, 28 Jan 2024 13:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706448110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5S1sJ30wG8z+/inRyHV9IQUB1GhJpEU57JV2++Bnuo=; b=WEKppdyfvQkUiw24YIggK664HeWw2f/NNkg6jJFFDtonti06VEH99CWDVTVxb6Hf2cQ0Wi DP4VaWh2d7GdbHrxmWAHc06TfVQiCtvhIoa+DZwXXCQfD3Zh2qHlJF1czwaaS8ogERr97l jF/vS6/PosLdIy27h+OGUwIR4oN5BI9r+FBZhewo+79xnxoMmKaU1LtLPiFw6Sko6dZ76z PlWFAQNkpzppDcC/2bhDNVgHrhtBLzav+nJNCapEVJVJbNY87JtzsZB892V6Zwif+eqoNR n2iEGh3ipHA6o+imxSJQ/Bu+cSYbN7jQJMzL3qCqPuhmURceHThYqSQVzxR6SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706448110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5S1sJ30wG8z+/inRyHV9IQUB1GhJpEU57JV2++Bnuo=; b=yHMddNug1RkEI/cpfpEJlInYw6PxywJq2W0iZfJ9HzrxZY1OfSvRwvLQIkOYmslu9qWbLS wJDzhh/QNEXh9PYFXJhGkyud0gqXvEOkdDJ15VZiAN0jZJvluUAvaK3YcyirswpxYweTkH Jnll3rvUXUTLZU+U9p9UztVxvW6rGR7Iq8bCpNvKRLzQt4h8P4kI4UPaWRSEILvCLGzJtY 6GzO3uhCgx8vsO7jMvwuk4bZJDg6tgbG6VPo9L17sYjsQyx3B8L84axQz6liMCw+s7TfrE uspEaCjoD42QiE7FbUteN/8qvJhoxIRr5xGVdbRpPDZnP236Jr2n/5dU1pMw8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706448110; a=rsa-sha256; cv=none; b=NWAZDYeGDXmoLbIdLLeW+ThklzKQfVmA05bI7pnf9zF28dESg4MDxdjt7RkjFNazcm73fM cqT/MGBQI4PMR2LjfIxadHejjs5MZYrm83qqgX5h5unks7wd8dlZSJIXRsW9dQL8zyAKgV 926EnTn8Tl39/CPaCKB3sEbYgM304Ei0NzBf1AT4z+FNlmC90WPpAX5vE23JFf9smSGNmx 521060PD3CNsG9vXlWm3wqVRNtJ+SthVqjSuTYqCs3gMj72sppq42kGdxQizYFC+Kll1ny tHdbPNTE3h5byNQTsBWaYfY+ZOjdYhLVCrQ4XL78ex5vZ+LIrAQq1EDrcDqaPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNBsn6qpfz18Yp; Sun, 28 Jan 2024 13:21: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 40SDLnxT052095; Sun, 28 Jan 2024 13:21:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SDLneL052092; Sun, 28 Jan 2024 13:21:49 GMT (envelope-from git) Date: Sun, 28 Jan 2024 13:21:49 GMT Message-Id: <202401281321.40SDLneL052092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 4d1161f094dd - main - subr_bus: report DEVICE_SUSPEND failures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d1161f094dd90428847f7e5989767e9957055f4 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=4d1161f094dd90428847f7e5989767e9957055f4 commit 4d1161f094dd90428847f7e5989767e9957055f4 Author: Andriy Gapon AuthorDate: 2023-01-03 08:39:32 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 13:21:09 +0000 subr_bus: report DEVICE_SUSPEND failures This greatly aids with diagnosing system suspend failures when they are due to a device driver or hardware. --- sys/kern/subr_bus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 21c2835f2ae6..c06f3df0c9c9 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -3463,8 +3463,12 @@ bus_generic_suspend_child(device_t dev, device_t child) error = DEVICE_SUSPEND(child); - if (error == 0) + if (error == 0) { child->flags |= DF_SUSPENDED; + } else { + printf("DEVICE_SUSPEND(%s) failed: %d\n", + device_get_nameunit(child), error); + } return (error); } From nobody Sun Jan 28 15:01:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNF4F24Czz58k8N; Sun, 28 Jan 2024 15:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNF4F1pL9z43fH; Sun, 28 Jan 2024 15:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706454061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TU+cZ74SJCLlowEfCYAp4rMYacFTeBBtIGDJivHuuRk=; b=yNQjJZy26uhSsdJCxGFiXjIxXMGzkwCUHcmNvGC9sDRyLC8h8i9tWvXonuWOCzO8KWUqyE h8nuP7rj9+JTAsbxZZj7XWz3hEGwk/hoqpcR/K9f0beFXsEkaY6E9KM5s+cGhS9RGvptxf Jsac6KrctXsf708HS2y+44zW/cuD8oSnEczjcwMG4sVqhkeJGN8pII+iZsLIRQeiYNlN/6 rX00nn17DcJG5jsXXRA5HqC8m/mZM/x8p28Bs+nbE6dYbCWgQtRpnV91A86YZty4aB1jyh 4t1LrN+9AwbEWV5KRT4pFrd6yuqakFsBju2NL0JyyneR7ws+wP2Xzfr/uSJtnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706454061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TU+cZ74SJCLlowEfCYAp4rMYacFTeBBtIGDJivHuuRk=; b=mK8sjVmaLj8kJMIMgEQJ9D5tK6M8uWfRTsolINVth7w+kg0i2CChDTcArN8+LR0YhD8caB 6ay+ZeiZyfHFTbQYWd+HGVvQabftVFCop7w0gzzwegefAZcPyWrIz3STYronbzX+DKhALr km1URHvxIdtn/WLIx3MUukcgz2yyjbB8tODvY8hTJkJrqYivEGioRIWwD0opqay1exTCwS MFkCQd9XvBCOdB7fAbZb8VRvzIPnNHGnWXuhwD91fN59q4inUWTzcvok2/VGILGaJnJW2j nD4jfKw/my5rCFBFQ3KI/3e/e7V1vLC6TPkuM8CEid8VoPc6oAAjCug9kgNkEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706454061; a=rsa-sha256; cv=none; b=RET+fWGkqTIVosw9I+B58J/Y8yxZxnVDXgNCxEU6pVZzCt04Qov0ZO55dY/D97jrXfuMJI oEmqIPphsgbAE2Asf6NPW1rH0cl9HBP7hoeag4wS505CwVWfGP1FmFrgyttHZNf+xcXkaf bbhtGUQvbUO6sSDwrz6qH/NPSL8kSLh/8MCxEFvs6jgsxxyvGMPLqGfPr+zW5c6yFS2L1W 9+NSwDgLGqKmbZaxQSLjDOqBh5+4P051CeG8omTM8m4/O8ZDQX1SHbzoF7zgQVkJlSQfAF +MATvPlYd36WVvfc1F1kx09qtK8Nd2tx5WerS+aAEvGkczsDmwacgJZkMejfSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNF4F0sDYz1BN8; Sun, 28 Jan 2024 15:01: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 40SF11IK020694; Sun, 28 Jan 2024 15:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SF11TX020691; Sun, 28 Jan 2024 15:01:01 GMT (envelope-from git) Date: Sun, 28 Jan 2024 15:01:01 GMT Message-Id: <202401281501.40SF11TX020691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0dd5a5603e7a - main - lib/msun: Cleanup after $FreeBSD$ removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dd5a5603e7a33d976f8e6015620bbc79839c609 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0dd5a5603e7a33d976f8e6015620bbc79839c609 commit 0dd5a5603e7a33d976f8e6015620bbc79839c609 Author: Steve Kargl AuthorDate: 2024-01-28 09:14:50 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-28 15:00:23 +0000 lib/msun: Cleanup after $FreeBSD$ removal Remove no longer needed explicit inclusion of sys/cdefs.h. PR: 276669 MFC after: 1 week --- lib/msun/bsdsrc/b_exp.c | 1 - lib/msun/bsdsrc/b_log.c | 1 - lib/msun/bsdsrc/b_tgamma.c | 1 - lib/msun/bsdsrc/mathimpl.h | 1 - lib/msun/i387/invtrig.c | 1 - lib/msun/ld128/e_lgammal_r.c | 1 - lib/msun/ld128/e_powl.c | 1 - lib/msun/ld128/e_rem_pio2l.h | 1 - lib/msun/ld128/invtrig.c | 1 - lib/msun/ld128/k_cosl.c | 1 - lib/msun/ld128/k_expl.h | 1 - lib/msun/ld128/k_sinl.c | 1 - lib/msun/ld128/k_tanl.c | 1 - lib/msun/ld128/s_cexpl.c | 1 - lib/msun/ld128/s_erfl.c | 1 - lib/msun/ld128/s_exp2l.c | 1 - lib/msun/ld128/s_expl.c | 1 - lib/msun/ld128/s_logl.c | 1 - lib/msun/ld80/e_lgammal_r.c | 1 - lib/msun/ld80/e_powl.c | 2 -- lib/msun/ld80/e_rem_pio2l.h | 1 - lib/msun/ld80/invtrig.c | 1 - lib/msun/ld80/k_cosl.c | 1 - lib/msun/ld80/k_expl.h | 1 - lib/msun/ld80/k_sinl.c | 1 - lib/msun/ld80/k_tanl.c | 1 - lib/msun/ld80/s_cexpl.c | 1 - lib/msun/ld80/s_erfl.c | 1 - lib/msun/ld80/s_exp2l.c | 1 - lib/msun/ld80/s_expl.c | 1 - lib/msun/ld80/s_logl.c | 1 - lib/msun/src/catrig.c | 1 - lib/msun/src/catrigf.c | 1 - lib/msun/src/catrigl.c | 1 - lib/msun/src/e_acos.c | 1 - lib/msun/src/e_acosf.c | 1 - lib/msun/src/e_acosh.c | 1 - lib/msun/src/e_acoshf.c | 1 - lib/msun/src/e_acoshl.c | 1 - lib/msun/src/e_acosl.c | 1 - lib/msun/src/e_asin.c | 1 - lib/msun/src/e_asinf.c | 1 - lib/msun/src/e_asinl.c | 1 - lib/msun/src/e_atan2.c | 1 - lib/msun/src/e_atan2f.c | 1 - lib/msun/src/e_atan2l.c | 1 - lib/msun/src/e_atanh.c | 1 - lib/msun/src/e_atanhf.c | 1 - lib/msun/src/e_atanhl.c | 1 - lib/msun/src/e_cosh.c | 1 - lib/msun/src/e_coshf.c | 1 - lib/msun/src/e_coshl.c | 1 - lib/msun/src/e_exp.c | 1 - lib/msun/src/e_expf.c | 1 - lib/msun/src/e_fmod.c | 1 - lib/msun/src/e_fmodf.c | 1 - lib/msun/src/e_fmodl.c | 1 - lib/msun/src/e_gamma.c | 1 - lib/msun/src/e_gamma_r.c | 1 - lib/msun/src/e_gammaf.c | 1 - lib/msun/src/e_gammaf_r.c | 1 - lib/msun/src/e_hypot.c | 1 - lib/msun/src/e_hypotf.c | 1 - lib/msun/src/e_hypotl.c | 1 - lib/msun/src/e_j0.c | 1 - lib/msun/src/e_j0f.c | 1 - lib/msun/src/e_j1.c | 1 - lib/msun/src/e_j1f.c | 1 - lib/msun/src/e_jn.c | 1 - lib/msun/src/e_jnf.c | 1 - lib/msun/src/e_lgamma.c | 1 - lib/msun/src/e_lgamma_r.c | 1 - lib/msun/src/e_lgammaf.c | 1 - lib/msun/src/e_lgammaf_r.c | 1 - lib/msun/src/e_lgammal.c | 1 - lib/msun/src/e_log.c | 1 - lib/msun/src/e_log10.c | 1 - lib/msun/src/e_log10f.c | 1 - lib/msun/src/e_log2.c | 1 - lib/msun/src/e_log2f.c | 1 - lib/msun/src/e_logf.c | 1 - lib/msun/src/e_pow.c | 1 - lib/msun/src/e_powf.c | 1 - lib/msun/src/e_rem_pio2.c | 1 - lib/msun/src/e_rem_pio2f.c | 1 - lib/msun/src/e_remainder.c | 1 - lib/msun/src/e_remainderf.c | 1 - lib/msun/src/e_remainderl.c | 1 - lib/msun/src/e_scalb.c | 1 - lib/msun/src/e_scalbf.c | 1 - lib/msun/src/e_sinh.c | 1 - lib/msun/src/e_sinhf.c | 1 - lib/msun/src/e_sinhl.c | 1 - lib/msun/src/e_sqrt.c | 1 - lib/msun/src/e_sqrtl.c | 1 - lib/msun/src/k_cos.c | 1 - lib/msun/src/k_cosf.c | 4 ---- lib/msun/src/k_exp.c | 1 - lib/msun/src/k_expf.c | 1 - lib/msun/src/k_log.h | 1 - lib/msun/src/k_logf.h | 1 - lib/msun/src/k_rem_pio2.c | 1 - lib/msun/src/k_sin.c | 1 - lib/msun/src/k_sincos.h | 1 - lib/msun/src/k_sincosf.h | 1 - lib/msun/src/k_sincosl.h | 1 - lib/msun/src/k_sinf.c | 4 ---- lib/msun/src/k_tan.c | 2 -- lib/msun/src/k_tanf.c | 4 ---- lib/msun/src/math.h | 1 - lib/msun/src/s_asinh.c | 1 - lib/msun/src/s_asinhf.c | 1 - lib/msun/src/s_asinhl.c | 1 - lib/msun/src/s_atan.c | 1 - lib/msun/src/s_atanf.c | 1 - lib/msun/src/s_atanl.c | 1 - lib/msun/src/s_carg.c | 1 - lib/msun/src/s_cargf.c | 1 - lib/msun/src/s_cargl.c | 1 - lib/msun/src/s_cbrt.c | 1 - lib/msun/src/s_cbrtf.c | 1 - lib/msun/src/s_cbrtl.c | 1 - lib/msun/src/s_ccosh.c | 1 - lib/msun/src/s_ccoshf.c | 1 - lib/msun/src/s_ceil.c | 1 - lib/msun/src/s_ceilf.c | 1 - lib/msun/src/s_ceill.c | 1 - lib/msun/src/s_cexp.c | 1 - lib/msun/src/s_cexpf.c | 1 - lib/msun/src/s_clog.c | 1 - lib/msun/src/s_clogf.c | 1 - lib/msun/src/s_clogl.c | 1 - lib/msun/src/s_copysign.c | 1 - lib/msun/src/s_copysignf.c | 1 - lib/msun/src/s_cos.c | 1 - lib/msun/src/s_cosf.c | 1 - lib/msun/src/s_cosl.c | 1 - lib/msun/src/s_cpow.c | 1 - lib/msun/src/s_cpowf.c | 1 - lib/msun/src/s_cpowl.c | 1 - lib/msun/src/s_cproj.c | 1 - lib/msun/src/s_cprojf.c | 1 - lib/msun/src/s_cprojl.c | 1 - lib/msun/src/s_csinh.c | 1 - lib/msun/src/s_csinhf.c | 1 - lib/msun/src/s_csqrt.c | 1 - lib/msun/src/s_csqrtf.c | 1 - lib/msun/src/s_csqrtl.c | 1 - lib/msun/src/s_ctanh.c | 1 - lib/msun/src/s_ctanhf.c | 1 - lib/msun/src/s_erf.c | 1 - lib/msun/src/s_erff.c | 1 - lib/msun/src/s_exp2.c | 1 - lib/msun/src/s_exp2f.c | 1 - lib/msun/src/s_expm1.c | 1 - lib/msun/src/s_expm1f.c | 1 - lib/msun/src/s_fabs.c | 1 - lib/msun/src/s_fabsf.c | 1 - lib/msun/src/s_fdim.c | 1 - lib/msun/src/s_finite.c | 1 - lib/msun/src/s_finitef.c | 1 - lib/msun/src/s_floor.c | 1 - lib/msun/src/s_floorf.c | 1 - lib/msun/src/s_floorl.c | 1 - lib/msun/src/s_fma.c | 1 - lib/msun/src/s_fmaf.c | 1 - lib/msun/src/s_fmal.c | 1 - lib/msun/src/s_fmax.c | 1 - lib/msun/src/s_fmaxf.c | 1 - lib/msun/src/s_fmaxl.c | 1 - lib/msun/src/s_fmin.c | 1 - lib/msun/src/s_fminf.c | 1 - lib/msun/src/s_fminl.c | 1 - lib/msun/src/s_frexp.c | 1 - lib/msun/src/s_frexpf.c | 1 - lib/msun/src/s_ilogb.c | 1 - lib/msun/src/s_ilogbf.c | 1 - lib/msun/src/s_ilogbl.c | 1 - lib/msun/src/s_llrint.c | 1 - lib/msun/src/s_llrintf.c | 1 - lib/msun/src/s_llrintl.c | 1 - lib/msun/src/s_llround.c | 1 - lib/msun/src/s_llroundf.c | 1 - lib/msun/src/s_llroundl.c | 1 - lib/msun/src/s_log1p.c | 1 - lib/msun/src/s_log1pf.c | 1 - lib/msun/src/s_logb.c | 1 - lib/msun/src/s_logbf.c | 1 - lib/msun/src/s_logbl.c | 1 - lib/msun/src/s_lrint.c | 1 - lib/msun/src/s_lrintf.c | 1 - lib/msun/src/s_lrintl.c | 1 - lib/msun/src/s_lround.c | 1 - lib/msun/src/s_lroundf.c | 1 - lib/msun/src/s_lroundl.c | 1 - lib/msun/src/s_modff.c | 1 - lib/msun/src/s_nearbyint.c | 1 - lib/msun/src/s_nextafter.c | 1 - lib/msun/src/s_nextafterf.c | 1 - lib/msun/src/s_nextafterl.c | 1 - lib/msun/src/s_nexttoward.c | 1 - lib/msun/src/s_nexttowardf.c | 1 - lib/msun/src/s_remquo.c | 1 - lib/msun/src/s_remquof.c | 1 - lib/msun/src/s_remquol.c | 1 - lib/msun/src/s_rint.c | 1 - lib/msun/src/s_rintf.c | 1 - lib/msun/src/s_rintl.c | 1 - lib/msun/src/s_round.c | 1 - lib/msun/src/s_roundf.c | 1 - lib/msun/src/s_roundl.c | 1 - lib/msun/src/s_scalbln.c | 1 - lib/msun/src/s_significand.c | 1 - lib/msun/src/s_significandf.c | 1 - lib/msun/src/s_sin.c | 1 - lib/msun/src/s_sincos.c | 1 - lib/msun/src/s_sincosf.c | 1 - lib/msun/src/s_sincosl.c | 1 - lib/msun/src/s_sinf.c | 1 - lib/msun/src/s_sinl.c | 1 - lib/msun/src/s_tan.c | 1 - lib/msun/src/s_tanf.c | 1 - lib/msun/src/s_tanh.c | 1 - lib/msun/src/s_tanhf.c | 1 - lib/msun/src/s_tanhl.c | 1 - lib/msun/src/s_tanl.c | 1 - lib/msun/src/s_tgammaf.c | 1 - lib/msun/src/s_trunc.c | 1 - lib/msun/src/s_truncf.c | 1 - lib/msun/src/s_truncl.c | 1 - lib/msun/src/w_cabs.c | 1 - lib/msun/src/w_cabsl.c | 1 - lib/msun/tests/rem_test.c | 1 - 233 files changed, 244 deletions(-) diff --git a/lib/msun/bsdsrc/b_exp.c b/lib/msun/bsdsrc/b_exp.c index 112717303ccd..44cd5190de92 100644 --- a/lib/msun/bsdsrc/b_exp.c +++ b/lib/msun/bsdsrc/b_exp.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include /* EXP(X) * RETURN THE EXPONENTIAL OF X * DOUBLE PRECISION (IEEE 53 bits, VAX D FORMAT 56 BITS) diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c index 64ca87e53b81..a82140bb98b5 100644 --- a/lib/msun/bsdsrc/b_log.c +++ b/lib/msun/bsdsrc/b_log.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include /* Table-driven natural logarithm. * * This code was derived, with minor modifications, from: diff --git a/lib/msun/bsdsrc/b_tgamma.c b/lib/msun/bsdsrc/b_tgamma.c index 07597cacf998..8369477c18b7 100644 --- a/lib/msun/bsdsrc/b_tgamma.c +++ b/lib/msun/bsdsrc/b_tgamma.c @@ -42,7 +42,6 @@ * porting to other precisions. */ -#include #include #include "math.h" diff --git a/lib/msun/bsdsrc/mathimpl.h b/lib/msun/bsdsrc/mathimpl.h index c8a0ceb4f6ef..a4d081c3f02f 100644 --- a/lib/msun/bsdsrc/mathimpl.h +++ b/lib/msun/bsdsrc/mathimpl.h @@ -36,7 +36,6 @@ #ifndef _MATHIMPL_H_ #define _MATHIMPL_H_ -#include #include #include "../src/math_private.h" diff --git a/lib/msun/i387/invtrig.c b/lib/msun/i387/invtrig.c index 523f022e0546..50d8d3af9343 100644 --- a/lib/msun/i387/invtrig.c +++ b/lib/msun/i387/invtrig.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #define STRUCT_DECLS diff --git a/lib/msun/ld128/e_lgammal_r.c b/lib/msun/ld128/e_lgammal_r.c index 4a8faca7befd..f8079b79d7fa 100644 --- a/lib/msun/ld128/e_lgammal_r.c +++ b/lib/msun/ld128/e_lgammal_r.c @@ -9,7 +9,6 @@ * ==================================================== */ -#include /* * See e_lgamma_r.c for complete comments. * diff --git a/lib/msun/ld128/e_powl.c b/lib/msun/ld128/e_powl.c index fd8b57b66bd5..f5a993cf0054 100644 --- a/lib/msun/ld128/e_powl.c +++ b/lib/msun/ld128/e_powl.c @@ -59,7 +59,6 @@ * */ -#include #include #include diff --git a/lib/msun/ld128/e_rem_pio2l.h b/lib/msun/ld128/e_rem_pio2l.h index 028705ca5ceb..44ec6eb10bfd 100644 --- a/lib/msun/ld128/e_rem_pio2l.h +++ b/lib/msun/ld128/e_rem_pio2l.h @@ -12,7 +12,6 @@ * Optimized by Bruce D. Evans. */ -#include /* ld128 version of __ieee754_rem_pio2l(x,y) * * return the remainder of x rem pi/2 in y[0]+y[1] diff --git a/lib/msun/ld128/invtrig.c b/lib/msun/ld128/invtrig.c index cd9a276b68d1..75aef7b5166a 100644 --- a/lib/msun/ld128/invtrig.c +++ b/lib/msun/ld128/invtrig.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "invtrig.h" /* diff --git a/lib/msun/ld128/k_cosl.c b/lib/msun/ld128/k_cosl.c index 6ff15eb7c763..c7562664bd3c 100644 --- a/lib/msun/ld128/k_cosl.c +++ b/lib/msun/ld128/k_cosl.c @@ -10,7 +10,6 @@ * ==================================================== */ -#include /* * ld128 version of k_cos.c. See ../src/k_cos.c for most comments. */ diff --git a/lib/msun/ld128/k_expl.h b/lib/msun/ld128/k_expl.h index 71924f16c8a4..86811dd8e089 100644 --- a/lib/msun/ld128/k_expl.h +++ b/lib/msun/ld128/k_expl.h @@ -30,7 +30,6 @@ * Optimized by Bruce D. Evans. */ -#include /* * ld128 version of k_expl.h. See ../ld80/s_expl.c for most comments. * diff --git a/lib/msun/ld128/k_sinl.c b/lib/msun/ld128/k_sinl.c index 5874d0596235..f2b17ba0eeb3 100644 --- a/lib/msun/ld128/k_sinl.c +++ b/lib/msun/ld128/k_sinl.c @@ -10,7 +10,6 @@ * ==================================================== */ -#include /* * ld128 version of k_sin.c. See ../src/k_sin.c for most comments. */ diff --git a/lib/msun/ld128/k_tanl.c b/lib/msun/ld128/k_tanl.c index 0846acfd3335..8aff0d1fc0d3 100644 --- a/lib/msun/ld128/k_tanl.c +++ b/lib/msun/ld128/k_tanl.c @@ -9,7 +9,6 @@ * ==================================================== */ -#include /* * ld128 version of k_tan.c. See ../src/k_tan.c for most comments. */ diff --git a/lib/msun/ld128/s_cexpl.c b/lib/msun/ld128/s_cexpl.c index 1e4141f162c5..9e3eebfa750e 100644 --- a/lib/msun/ld128/s_cexpl.c +++ b/lib/msun/ld128/s_cexpl.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/msun/ld128/s_erfl.c b/lib/msun/ld128/s_erfl.c index 8a3c5d311df2..227c31fd096b 100644 --- a/lib/msun/ld128/s_erfl.c +++ b/lib/msun/ld128/s_erfl.c @@ -9,7 +9,6 @@ * ==================================================== */ -#include /* * See s_erf.c for complete comments. * diff --git a/lib/msun/ld128/s_exp2l.c b/lib/msun/ld128/s_exp2l.c index 74ae8c2daad8..249cb4cb8bb0 100644 --- a/lib/msun/ld128/s_exp2l.c +++ b/lib/msun/ld128/s_exp2l.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/msun/ld128/s_expl.c b/lib/msun/ld128/s_expl.c index 6d6c22d917fe..e1358e2213a0 100644 --- a/lib/msun/ld128/s_expl.c +++ b/lib/msun/ld128/s_expl.c @@ -28,7 +28,6 @@ * Optimized by Bruce D. Evans. */ -#include /* * ld128 version of s_expl.c. See ../ld80/s_expl.c for most comments. */ diff --git a/lib/msun/ld128/s_logl.c b/lib/msun/ld128/s_logl.c index 8961dd0c96db..4d32462e5653 100644 --- a/lib/msun/ld128/s_logl.c +++ b/lib/msun/ld128/s_logl.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /** * Implementation of the natural logarithm of x for 128-bit format. * diff --git a/lib/msun/ld80/e_lgammal_r.c b/lib/msun/ld80/e_lgammal_r.c index 29459fd614d5..9f8b8f0f98bb 100644 --- a/lib/msun/ld80/e_lgammal_r.c +++ b/lib/msun/ld80/e_lgammal_r.c @@ -9,7 +9,6 @@ * ==================================================== */ -#include /* * See e_lgamma_r.c for complete comments. * diff --git a/lib/msun/ld80/e_powl.c b/lib/msun/ld80/e_powl.c index 2daf26aab93b..b028d3cb7ff2 100644 --- a/lib/msun/ld80/e_powl.c +++ b/lib/msun/ld80/e_powl.c @@ -14,7 +14,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include "math_private.h" @@ -114,7 +113,6 @@ __p1evll(long double x, long double *PP, int n) * */ -#include #include #include diff --git a/lib/msun/ld80/e_rem_pio2l.h b/lib/msun/ld80/e_rem_pio2l.h index b32a5f1c7922..d0a4710bc4e2 100644 --- a/lib/msun/ld80/e_rem_pio2l.h +++ b/lib/msun/ld80/e_rem_pio2l.h @@ -12,7 +12,6 @@ * Optimized by Bruce D. Evans. */ -#include /* ld80 version of __ieee754_rem_pio2l(x,y) * * return the remainder of x rem pi/2 in y[0]+y[1] diff --git a/lib/msun/ld80/invtrig.c b/lib/msun/ld80/invtrig.c index 0e2d49546391..76eb681454d3 100644 --- a/lib/msun/ld80/invtrig.c +++ b/lib/msun/ld80/invtrig.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "invtrig.h" /* diff --git a/lib/msun/ld80/k_cosl.c b/lib/msun/ld80/k_cosl.c index 28848cc62e41..371c360aa2ce 100644 --- a/lib/msun/ld80/k_cosl.c +++ b/lib/msun/ld80/k_cosl.c @@ -10,7 +10,6 @@ * ==================================================== */ -#include /* * ld80 version of k_cos.c. See ../src/k_cos.c for most comments. */ diff --git a/lib/msun/ld80/k_expl.h b/lib/msun/ld80/k_expl.h index 8c3617e4b177..fabf5a792205 100644 --- a/lib/msun/ld80/k_expl.h +++ b/lib/msun/ld80/k_expl.h @@ -30,7 +30,6 @@ * Optimized by Bruce D. Evans. */ -#include /* * See s_expl.c for more comments about __k_expl(). * diff --git a/lib/msun/ld80/k_sinl.c b/lib/msun/ld80/k_sinl.c index c2910993556a..ffc00be23f1c 100644 --- a/lib/msun/ld80/k_sinl.c +++ b/lib/msun/ld80/k_sinl.c @@ -10,7 +10,6 @@ * ==================================================== */ -#include /* * ld80 version of k_sin.c. See ../src/k_sin.c for most comments. */ diff --git a/lib/msun/ld80/k_tanl.c b/lib/msun/ld80/k_tanl.c index f86c6cc93c6a..b3a4d9e05255 100644 --- a/lib/msun/ld80/k_tanl.c +++ b/lib/msun/ld80/k_tanl.c @@ -9,7 +9,6 @@ * ==================================================== */ -#include /* * ld80 version of k_tan.c. See ../src/k_tan.c for most comments. */ diff --git a/lib/msun/ld80/s_cexpl.c b/lib/msun/ld80/s_cexpl.c index 81a4d727561b..cbe9dcd64099 100644 --- a/lib/msun/ld80/s_cexpl.c +++ b/lib/msun/ld80/s_cexpl.c @@ -28,7 +28,6 @@ * src/s_cexp.c converted to long double complex by Steven G. Kargl */ -#include #include #include #ifdef __i386__ diff --git a/lib/msun/ld80/s_erfl.c b/lib/msun/ld80/s_erfl.c index e33858b95115..047077ca4470 100644 --- a/lib/msun/ld80/s_erfl.c +++ b/lib/msun/ld80/s_erfl.c @@ -9,7 +9,6 @@ * ==================================================== */ -#include /* * See s_erf.c for complete comments. * diff --git a/lib/msun/ld80/s_exp2l.c b/lib/msun/ld80/s_exp2l.c index 94aecf1843cd..9d979994ece8 100644 --- a/lib/msun/ld80/s_exp2l.c +++ b/lib/msun/ld80/s_exp2l.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/msun/ld80/s_expl.c b/lib/msun/ld80/s_expl.c index 065e02fae1b0..03d7b366151a 100644 --- a/lib/msun/ld80/s_expl.c +++ b/lib/msun/ld80/s_expl.c @@ -28,7 +28,6 @@ * Optimized by Bruce D. Evans. */ -#include /** * Compute the exponential of x for Intel 80-bit format. This is based on: * diff --git a/lib/msun/ld80/s_logl.c b/lib/msun/ld80/s_logl.c index 459374d7d164..2c5d1e2dd08f 100644 --- a/lib/msun/ld80/s_logl.c +++ b/lib/msun/ld80/s_logl.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /** * Implementation of the natural logarithm of x for Intel 80-bit format. * diff --git a/lib/msun/src/catrig.c b/lib/msun/src/catrig.c index 929811a09a3b..45af164a66c5 100644 --- a/lib/msun/src/catrig.c +++ b/lib/msun/src/catrig.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/msun/src/catrigf.c b/lib/msun/src/catrigf.c index 7feecfc5de38..da90629ec076 100644 --- a/lib/msun/src/catrigf.c +++ b/lib/msun/src/catrigf.c @@ -40,7 +40,6 @@ * a few comments on the right of declarations remain. */ -#include #include #include diff --git a/lib/msun/src/catrigl.c b/lib/msun/src/catrigl.c index 7cc3c1431731..faf9d299670e 100644 --- a/lib/msun/src/catrigl.c +++ b/lib/msun/src/catrigl.c @@ -39,7 +39,6 @@ * a few comments on the right of declarations remain. */ -#include #include #include diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c index 75494529138a..af51fe1ecddc 100644 --- a/lib/msun/src/e_acos.c +++ b/lib/msun/src/e_acos.c @@ -10,7 +10,6 @@ * ==================================================== */ -#include /* acos(x) * Method : * acos(x) = pi/2 - asin(x) diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c index 29f6d4a78495..42ba126d1baa 100644 --- a/lib/msun/src/e_acosf.c +++ b/lib/msun/src/e_acosf.c @@ -13,7 +13,6 @@ * ==================================================== */ -#include #include "math.h" #include "math_private.h" diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c index 36bac70a58f9..0e5640b623d9 100644 --- a/lib/msun/src/e_acosh.c +++ b/lib/msun/src/e_acosh.c @@ -11,7 +11,6 @@ * */ -#include /* acosh(x) * Method : * Based on diff --git a/lib/msun/src/e_acoshf.c b/lib/msun/src/e_acoshf.c index df12609671cf..b6fbd2c14cb4 100644 --- a/lib/msun/src/e_acoshf.c +++ b/lib/msun/src/e_acoshf.c @@ -13,7 +13,6 @@ * ==================================================== */ -#include #include "math.h" #include "math_private.h" diff --git a/lib/msun/src/e_acoshl.c b/lib/msun/src/e_acoshl.c index 72ee019899f9..6bfa6244df09 100644 --- a/lib/msun/src/e_acoshl.c +++ b/lib/msun/src/e_acoshl.c @@ -12,7 +12,6 @@ * */ -#include /* * See e_acosh.c for complete comments. * diff --git a/lib/msun/src/e_acosl.c b/lib/msun/src/e_acosl.c index 8781a98faffd..209814383e51 100644 --- a/lib/msun/src/e_acosl.c +++ b/lib/msun/src/e_acosl.c @@ -11,7 +11,6 @@ * ==================================================== */ -#include /* * See comments in e_acos.c. * Converted to long double by David Schultz . diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c index 72853652fe72..530bf7910756 100644 --- a/lib/msun/src/e_asin.c +++ b/lib/msun/src/e_asin.c @@ -10,7 +10,6 @@ * ==================================================== */ -#include /* asin(x) * Method : * Since asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ... diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c index 391c15870f84..a2ee1a166f03 100644 --- a/lib/msun/src/e_asinf.c +++ b/lib/msun/src/e_asinf.c @@ -13,7 +13,6 @@ * ==================================================== */ -#include #include "math.h" #include "math_private.h" diff --git a/lib/msun/src/e_asinl.c b/lib/msun/src/e_asinl.c index 2100c20e3896..bb2320e129e7 100644 --- a/lib/msun/src/e_asinl.c +++ b/lib/msun/src/e_asinl.c @@ -11,7 +11,6 @@ * ==================================================== */ -#include /* * See comments in e_asin.c. * Converted to long double by David Schultz . diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c index 42665f130ac7..ab5fc72dbabf 100644 --- a/lib/msun/src/e_atan2.c +++ b/lib/msun/src/e_atan2.c @@ -11,7 +11,6 @@ * */ -#include /* atan2(y,x) * Method : * 1. Reduce y to positive by atan2(y,x)=-atan2(-y,x). diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c index af8c00851476..408f3646f612 100644 --- a/lib/msun/src/e_atan2f.c +++ b/lib/msun/src/e_atan2f.c @@ -13,7 +13,6 @@ * ==================================================== */ -#include #include "math.h" #include "math_private.h" diff --git a/lib/msun/src/e_atan2l.c b/lib/msun/src/e_atan2l.c index 8266bda19de3..a27fd3efc141 100644 --- a/lib/msun/src/e_atan2l.c +++ b/lib/msun/src/e_atan2l.c @@ -12,7 +12,6 @@ * */ -#include /* * See comments in e_atan2.c. * Converted to long double by David Schultz . diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c index 27e2bfc5f0d0..0cc0b9248b6b 100644 --- a/lib/msun/src/e_atanh.c +++ b/lib/msun/src/e_atanh.c @@ -11,7 +11,6 @@ * */ -#include /* atanh(x) * Method : * 1.Reduced x to positive by atanh(-x) = -atanh(x) diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c index 134513e5b817..a2d6b69a6812 100644 --- a/lib/msun/src/e_atanhf.c +++ b/lib/msun/src/e_atanhf.c @@ -13,7 +13,6 @@ * ==================================================== */ -#include #include "math.h" #include "math_private.h" diff --git a/lib/msun/src/e_atanhl.c b/lib/msun/src/e_atanhl.c index 0574a3c82369..cb707272a66c 100644 --- a/lib/msun/src/e_atanhl.c +++ b/lib/msun/src/e_atanhl.c @@ -12,7 +12,6 @@ * */ -#include /* * See e_atanh.c for complete comments. * diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c index 636fe05faa71..5c3614efbf47 100644 --- a/lib/msun/src/e_cosh.c +++ b/lib/msun/src/e_cosh.c @@ -10,7 +10,6 @@ * ==================================================== */ -#include /* cosh(x) * Method : * mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2 diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c index 8c5457e24a51..40443b8b84d3 100644 --- a/lib/msun/src/e_coshf.c +++ b/lib/msun/src/e_coshf.c @@ -13,7 +13,6 @@ * ==================================================== */ -#include #include "math.h" #include "math_private.h" diff --git a/lib/msun/src/e_coshl.c b/lib/msun/src/e_coshl.c index de54b8183bbb..efb5094d39f9 100644 --- a/lib/msun/src/e_coshl.c +++ b/lib/msun/src/e_coshl.c @@ -11,7 +11,6 @@ * ==================================================== */ -#include /* * See e_cosh.c for complete comments. * diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c index a872c1d4d800..6401556a44e4 100644 --- a/lib/msun/src/e_exp.c +++ b/lib/msun/src/e_exp.c @@ -9,7 +9,6 @@ * ==================================================== */ -#include /* exp(x) * Returns the exponential of x. * diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c index 2dbce9dd870d..fe2e6779469f 100644 --- a/lib/msun/src/e_expf.c +++ b/lib/msun/src/e_expf.c @@ -13,7 +13,6 @@ * ==================================================== */ -#include #include #include "math.h" diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c index 4639d52e1cbb..77afd116c658 100644 --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -10,7 +10,6 @@ * ==================================================== */ -#include /* * fmod(x,y) * Return x mod y in exact arithmetic diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c index 0e6633fbe739..a7d1a0c22acd 100644 --- a/lib/msun/src/e_fmodf.c +++ b/lib/msun/src/e_fmodf.c @@ -13,7 +13,6 @@ * ==================================================== */ -#include /* * fmodf(x,y) * Return x mod y in exact arithmetic diff --git a/lib/msun/src/e_fmodl.c b/lib/msun/src/e_fmodl.c index 96967b628aa6..d5997e1f4e47 100644 --- a/lib/msun/src/e_fmodl.c +++ b/lib/msun/src/e_fmodl.c @@ -9,7 +9,6 @@ * ==================================================== */ -#include #include #include diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c index e69c7fe40e2e..43541ad935bd 100644 --- a/lib/msun/src/e_gamma.c +++ b/lib/msun/src/e_gamma.c @@ -11,7 +11,6 @@ * */ -#include /* gamma(x) * Return the logarithm of the Gamma function of x. * diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c index 1c83ce658c8a..f317ae435cdc 100644 --- a/lib/msun/src/e_gamma_r.c +++ b/lib/msun/src/e_gamma_r.c @@ -11,7 +11,6 @@ * */ -#include /* gamma_r(x, signgamp) * Reentrant version of the logarithm of the Gamma function * with user provide pointer for the sign of Gamma(x). diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c index 3afef79de53a..98da5711e811 100644 --- a/lib/msun/src/e_gammaf.c +++ b/lib/msun/src/e_gammaf.c @@ -13,7 +13,6 @@ * ==================================================== */ -#include /* gammaf(x) * Return the logarithm of the Gamma function of x. * diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c index 5b3bd535aa42..ae80c1bae2cc 100644 --- a/lib/msun/src/e_gammaf_r.c +++ b/lib/msun/src/e_gammaf_r.c @@ -13,7 +13,6 @@ * ==================================================== *** 2050 LINES SKIPPED *** From nobody Sun Jan 28 15:42:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNG040DzVz58nQr; Sun, 28 Jan 2024 15:42: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 4TNG03693lz49w7; Sun, 28 Jan 2024 15:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706456547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=juL+5ZM0bP/B19kKprf1Y7/6lTHF1qilgsQGgH0oCGE=; b=F4ShW5OJptWEjMK4zzs3/UGlcZSleMiuSLdOAWr+B2TlEpGbiPjpxjoQnI7mrKs5m2y601 WHUrDkf1SKUo8l4164dd0xnQox4zhaBDknlEN0gDzxmq+qs4CI/3SJlxJC69t5xFPCep2t Tm3vmBZu115gTqxycUvPj0Tgccq17rL8e2WICBOfOCNuKjYXE5g1hJ5Yr1HbhxHIzX3B1V kXP+/ZPL1Ce60BobcFkIMB4LYhao+CqwHpeCz/Xil1DHsHRMji7ublpgK/XcKRDePem3JO 0+9ikNCinXHCsywXS4/ArrjiJ6CWhrpUr2FCHc82LSte06vLy5L1yMc+ZNWdFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706456547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=juL+5ZM0bP/B19kKprf1Y7/6lTHF1qilgsQGgH0oCGE=; b=f9U8u7zoACSxQHaf7KAptLU1EgpGEmjaQX3fJm6JwNl6mG+vEmFWTugIPkY/9MI7W1hrWE r5/9nIKgd47w9u1HWFyOYl9wDuYLlN5gfxjaYkbEQEr+5lJcQIfOKpuIURu9n777OJKdSs ErylFXBLIRyQZ3ebMswxODU78SRqGVqJkZsnTd56mC7xqW7uaqvnApBStMpJTL102OHkM6 DNuOFmX/yO2lnj/G+bMPdrv+M2pmrYcuHLEpHyFYYK7ROGFqU8K/1OWmG6LUOpFKo76okA Kj25E8DdXqZFcbNQvcUIOfodpaHndjBHbHF3q4eLiueRtWYbRD7/3t71jiTrKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706456547; a=rsa-sha256; cv=none; b=e7O+RKU0dmsZfiGIVkLuppSKkSeHltYhBpVaeCgewU4eQXj7LAVsAtEhNbtCi1mvlJh7Pk 6WT125gDNEik+rW8nw4Wvuuwlh3hLGXpxE6EDwaw55kuKUluxFnOHUt2fsaBflMlfbejoi oZe4gGC+GUw2ZtCrsQaFxacGXSSZuUo01GqM8N0yrLrSNI122G1Mzqu9D8CNqv05yhhnx6 m08JribQiMqeIWTMsTbMwm+iTA6rrpkDtijhufoCj6vEEdDBcuqk/Lp+QTLtYQCn5zMt7K 3VH2X6uXat6cjmXtkMdkii3tmsNjFWWCKKSIZOhkxCHuXKUBrK+Zr07c1D6+/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 4TNG035DMVz1ClM; Sun, 28 Jan 2024 15:42:27 +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 40SFgRNs092824; Sun, 28 Jan 2024 15:42:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SFgRgq092821; Sun, 28 Jan 2024 15:42:27 GMT (envelope-from git) Date: Sun, 28 Jan 2024 15:42:27 GMT Message-Id: <202401281542.40SFgRgq092821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 551921a75775 - main - if_eqos: Fix a typo in a kernel error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 551921a757758353af51cd0283e9e4bcee9a84d2 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=551921a757758353af51cd0283e9e4bcee9a84d2 commit 551921a757758353af51cd0283e9e4bcee9a84d2 Author: Gordon Bergling AuthorDate: 2024-01-28 15:42:12 +0000 Commit: Gordon Bergling CommitDate: 2024-01-28 15:42:12 +0000 if_eqos: Fix a typo in a kernel error message - s/errer/error/ MFC after: 5 days --- sys/dev/eqos/if_eqos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c index 17c820a1b191..566f6ffd0a42 100644 --- a/sys/dev/eqos/if_eqos.c +++ b/sys/dev/eqos/if_eqos.c @@ -687,7 +687,7 @@ eqos_rxintr(struct eqos_softc *sc) break; if (rdes3 & (EQOS_RDES3_OE | EQOS_RDES3_RE)) - printf("Receive errer rdes3=%08x\n", rdes3); + printf("Receive error rdes3=%08x\n", rdes3); bus_dmamap_sync(sc->rx.buf_tag, sc->rx.buf_map[sc->rx.head].map, BUS_DMASYNC_POSTREAD); From nobody Sun Jan 28 16:28:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNH1Q6M00z58skN for ; Sun, 28 Jan 2024 16:28:42 +0000 (UTC) (envelope-from qgmcrae@yahoo.com) Received: from sonic305-21.consmr.mail.ne1.yahoo.com (sonic305-21.consmr.mail.ne1.yahoo.com [66.163.185.147]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNH1Q4tyWz4KPt for ; Sun, 28 Jan 2024 16:28:42 +0000 (UTC) (envelope-from qgmcrae@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1706459320; bh=kxzCQDHEpM4w0NdspALh4uX8AxNcXFEbD+PJlkHl8VQ=; h=From:Subject:Date:References:Cc:In-Reply-To:To:From:Subject:Reply-To; b=nvKk5I2kAGYWeikvu7e+02K53SPtFI8lhHo3kOjwBDanT9Tw5sQMlbLWmSMJzbCn5YwRjueLusmHe0/cWp9fxJcisss2ycTonsLCtCgAxQprZc0GkLwqFo32tWyHAISpgIVeHOdj5DyJu7F2LsWlSwmTertUoBCdn5UkDQwXEANwXgWxd7/70P9pHQ6x+w2L+Ti/+9rzDVdqQd93ZxNlNeiIWLKOCPXVvBrFmliNUUz+Ref74rrD3UpxyKnm8VjfyrpaoqrY8PtvXtpDUahJJbObzORF1B9sNX6XyIWrVWJ3PbG865US++f8lrtpViBjWfRf63v/SeEWpsbJQa/oBQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1706459320; bh=gCb9sdoK9JSEftaIGtIfMSYDNR10XwHnn6fn3vvO5zA=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=kTpK5QtPvEBsosGSWWOxl7TPLUQcTi2n3SasqAjHIJSkHBSgs3AQqARkn3ex4ZjxgGkhU88qkhPMjMcfAtXBqNv1GRHYU/rZO1zyjoTbhppibhp7o7cCAsE8Bazl+BN4SrFJV2t+Z1rYx+WTdLd+5c7shmWM9uhNrZdjcx/2VYIB2BlR3wcZwH5f+0xzY3P6ZQxvK4Wo2zllB7MJIuoLhUXOpdaSY2IcXhuSvAM8QKO9cmfYaaL1xrMHZtERywzu1diAyHnhPpnO1NLVuxze7KRStkP+1enGXPf/4I4mZq1Fnb7qLG0XICc+nPFTf8MsdKEccHBduqlGG+JcxtQ2iQ== X-YMail-OSG: LLi86TgVM1nh7kXisHMRPqZdO7QNkQAa71mNtC_rO1L84YKqAs2IbB7.m40lao4 Y5GD3aNpcP8SfMCyTzFdRtYLpd2wFGbEthXzbtuFbP1o4S_30b2_PVanWmBejTVHqV2zGCUnGLai pztrM..fCN1QkdigyW0vkGnzZs6j2LZ0s3ID8oU0vQjdyuq39.A3eL9T93jHMAi8mjggR131KUqx BDIOxv9wEMVAW4F2LN2gIlWMNrA0GDYE.Mh8oJ6oWK2yVxkKPQ3ltj_BKl2EP9KPsL8cKGYZ_lLw CGHwGMu4XaHGs7J_km0mRQ6XfuFVe_EqyqaMQSrT5LxVbnAl_HLOrlPAUHhQEYSfyewm9wKvtL9O ZfslwCzMqEd89yydB9l2DxMtL.61w1L72wPx3OfafDgaRqFrGTh13jiulNZpTZa25yoA2DM_9t7x XrZCXf0fueQKoKkFig1PnesCKnnq7Up68EZY5x0qTgSPxDSqihLTqml7ZTCTDzvxO90XtbqG.hds aY1aA.Jd9KcJF3poTF1TKuJXFIJvvFmrI4l92U9Se3N0AjDZc86OtdMDYyoEKpdaGodXlHnkik26 rRR_f6U5p9R6OUA5tuHffTv1eK2c5XYGmqmiLJEGx_2gka5nfq3jkpbTAAjtI.cc7wfCnch9LISr 6p8l4RQ6PxFAd30HYw3t95cfUBfVRz8kWUvU_Xg4PoQS1maj738XNpIggu1bBlY4MSnOMP.YfvJA JqGkuL26uSO1OEYEOSbZPpw6RPvp2MwWtjqj_x5Mjuw8xEm3mL2AvUC8DkxS1Exg0CGnpyhkX5UK T.ZZfElX0GO2avzYsjC6QRbVZRK6gzPkB7IifweCdYQU0s3gPUhl7H0MOMQET8EZhkq__2asew2N 0AUPsY5oY9FXhIzmLWLrFSnT6ngom544tIXFfPHGhNeihSBJSnanl0V3eCLSakeIdF3Qk1T7VFp6 rIKlqs13IO_SYQz7OLW.3XqiR_sUks9LWx0xS5ji6vmEJOxI5gOmWVTxl3Pdu213ZdmWvBkUe4aX NBGOC3dLnZI.B9r2Gim94FnA6GkVTm_72frCHZrOQCD6ncGiMc8pszh2x.3FrwXtaJ6Hxl2IpxzX PGmLEnQQKi74B_sWFrkGhj4tKshAtRtFThWMHAfIaDkpFuSgWULRNZy_N6VWyvfT7KNEtdDjJVcJ tntr7CKnGpWR_qKGiWdA8Nbd8WBFAyx._i8r206Ypa_wgHTC.4ygGP.1uXLvXibYAnXuujud17pZ QKxhFSVDxEf_slfGmL2jFJ4o5Kq87XwRQ3jT0rF8pJpMzm5LiujurgFpo5qejDPD_SLZnPv50ghM Kz7lyjbQF.5ZH022PNt5g3FXi.y8cl6sUX8cL2vPtuZKR3mXtCMyVA6VrSBEDZ8WJlgRqkrmpzHs tYG9B4754ZzoSyzqXwY9kYRYGbQC5u1bQpqXcD7qSijuo1WMLIocwu6J4QEXoYAvB6DAAYgwdPJ9 2I3XAD.GTktEUO09bF5zWQ1VsOeSWGeMAO15gaQhR9ubCK3et7FjMx3b0zgPtT_bEbZ1vyrTXAWn x5D9OfvZd6sgYA5LCrwYtzTEov7NypTohxzExxo0Nwyl47JGAslSe8JCYZnTfE1EwIVIT5.cO0YH w5YvS5sOshIYAaCqdWPFoOWQkjDl0fDKCxlvk_59YQvbNk47dU2jIMPaU6jcpXhMb5ug9PjVVt5b 12fYw7IijmGNvt63XNiHnowr.6NbHOQqfs6JLoC1zYmJRpF64JzP4R.cP7OaNgDKyYPqDR1OCWAB JyVhZYBnFbbYgcJ7IkaVd0BaMaOTwEdo3636RbNtI2xBbBH8HIfu0vPPLkQRso9b5two8.YeWs.1 X7DjYp0gT.1Mq3MSVWbNyXMTsdD6rqXyeof2MZkqMdUhIyvcpSAjczzprJsRgh2mSmwT.en8KCwG fbNAvooQcz2iCQqVf9Tut1INXSVLfk8v6udRNOOjcrTrwz9y4XSJHQr.mUckqxEx.fwOZ8yE6J24 LJmNt_ZevQD5SuAAUF6E.q9byDaTvs6LYil_KxystVSeGXDYDCpbHzbzZ.nM_oeWsR88UVyntFpC .4J5TpldRwfUJoNnZqYpjLSiokFJuE6zf9g5cT54psKbfFORfio_EeaRB3usIh3PuK68Wt5MnV69 NjBPUdW_byoIOMIsddldSwSHxy7ZluF5hje7sx9PoN5jvbKkiZv.D8qQwGll.K.2twLQ_hZ8ylqS p.Qn5f11p6cmct7ypOaj780qzjMZgK0kJrN4S6EZw1GUr X-Sonic-MF: X-Sonic-ID: e6e1a170-f933-4183-bc75-cbc223ffee4a Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.ne1.yahoo.com with HTTP; Sun, 28 Jan 2024 16:28:40 +0000 Received: by hermes--production-bf1-7d6dbd57c9-s4dph (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 9bc13427c234747682070d9bfbbdbe23; Sun, 28 Jan 2024 16:28:35 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Quincy Mcrae List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (1.0) Subject: Re: git: 4d1161f094dd - main - subr_bus: report DEVICE_SUSPEND failures Date: Sun, 28 Jan 2024 12:28:23 -0400 Message-Id: References: <202401281321.40SDLneL052092@gitrepo.freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <202401281321.40SDLneL052092@gitrepo.freebsd.org> To: Andriy Gapon X-Mailer: iPhone Mail (21D50) X-Rspamd-Queue-Id: 4TNH1Q4tyWz4KPt X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36646, ipnet:66.163.184.0/21, country:US] Good afternoon, Could you please unsubscribe me from the group? Quincy Sent from my iPhone > On Jan 28, 2024, at 9:21=E2=80=AFAM, Andriy Gapon wrote:= >=20 > =EF=BB=BFThe branch main has been updated by avg: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D4d1161f094dd90428847f7e5989= 767e9957055f4 >=20 > commit 4d1161f094dd90428847f7e5989767e9957055f4 > Author: Andriy Gapon > AuthorDate: 2023-01-03 08:39:32 +0000 > Commit: Andriy Gapon > CommitDate: 2024-01-28 13:21:09 +0000 >=20 > subr_bus: report DEVICE_SUSPEND failures >=20 > This greatly aids with diagnosing system suspend failures when > they are due to a device driver or hardware. > --- > sys/kern/subr_bus.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) >=20 > diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c > index 21c2835f2ae6..c06f3df0c9c9 100644 > --- a/sys/kern/subr_bus.c > +++ b/sys/kern/subr_bus.c > @@ -3463,8 +3463,12 @@ bus_generic_suspend_child(device_t dev, device_t ch= ild) >=20 > error =3D DEVICE_SUSPEND(child); >=20 > - if (error =3D=3D 0) > + if (error =3D=3D 0) { > child->flags |=3D DF_SUSPENDED; > + } else { > + printf("DEVICE_SUSPEND(%s) failed: %d\n", > + device_get_nameunit(child), error); > + } >=20 > return (error); > } >=20 From nobody Sun Jan 28 17:57:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNJzf69H7z5919J; Sun, 28 Jan 2024 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNJzf5jJVz4X9C; Sun, 28 Jan 2024 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706464638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oiW5jn5H21h6sevTxKUV3ynieGQLAVoJX0IMQ1CYbLA=; b=Kv98XmnI7SiELAjMk/5UaNHRYBwSq4Dw66PAXRUqgh2T3m5QtwQhNULaTeTA8p4M/8MbAi u0036a8++FhiGAfK+m2IqhnOqh8HdF5zehPDQ56mmD0VM0qX4P+YadDGne8gzmTOwXi69m 54ulLVFqsHcJhRtPpcf+v/uV9t2hSqyf7IFneJedMWM//E3TfOK+JD1TLc303lbeOKQSsW MtJrE7AodLyDkhSaTROX8TwYiWr2XwRC08vj80pDnyclIUXgbz6dpfRsIEFAEi06Q9CssM ajcAqhKtLYS08cOBMqPJvb2GeEiDKsUd92+bOZ4Djwct8mksk4RJG6+jAXJVdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706464638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oiW5jn5H21h6sevTxKUV3ynieGQLAVoJX0IMQ1CYbLA=; b=SXsH9/cOJX4pEmiMQUdlavJ0/Pes7a0du+Zu0FKeP23Nmzm8Z8J6egCbi5DTgceoPaojMO a46jtQLwl2fQF2iMDymQItd4TlslQqC/nR7vf6MP7zFhBJUo26HHgPpj6PF/dQBz1SylUM MSMX6GNDM6uO8b93Fm3g+Fv5r/+5p2kWlUo52mvfWooQ9jw10uXXeqcsfLSZAFbxgAwR01 actODakhoeMbq7LBHMiBB1ByBORRoNap7jmTbCMnuSgh2KHoXrWJVouIyQtMFNTJgLbu6p tvbac8OUTAetnDxjJRsrCd7yD+gFocWi5Dkd2+oze+05D2UCFF8PaG3prElDEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706464638; a=rsa-sha256; cv=none; b=S8iNIZCOeEs6XfWZxYUpCqdaW5rbr0fowJCXZoOfBQA4uNmYfPlzUmMiiH1EUYJzKiDSnp 0RGny0e0+iYV0HFnRt1XHQ5mGjbcH8N+3B/cmDalrgfNKjd25qJKsWuclrbWdibkzZ+b59 lohBPfEKOaz1LsOGAdBp06Mi0GrGsfXoaOsVChbk1+eLRA6C+P6sJfwEqv5aAPVy9OimN/ XoFb5WtJOz1aAN+MYo1rzUAbF52uTAwSmbrxREP4MX3AyR8aQU4mt6/qTTqskIN2yJ/PyO ifAykm7cIbKXbtoxDtVBmxk/ooeQ6+vlGSJw1Ij06tGWxMrvqQ56ST5G0OlaGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNJzf4mwYzHBM; Sun, 28 Jan 2024 17:57:18 +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 40SHvIf8011886; Sun, 28 Jan 2024 17:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SHvINt011883; Sun, 28 Jan 2024 17:57:18 GMT (envelope-from git) Date: Sun, 28 Jan 2024 17:57:18 GMT Message-Id: <202401281757.40SHvINt011883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Gmelin Subject: git: e65182c7bc28 - stable/14 - libifconfig: Fix bridge status member list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grembo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e65182c7bc2835d847f363bf5d7ffc6e14426570 Auto-Submitted: auto-generated The branch stable/14 has been updated by grembo: URL: https://cgit.FreeBSD.org/src/commit/?id=e65182c7bc2835d847f363bf5d7ffc6e14426570 commit e65182c7bc2835d847f363bf5d7ffc6e14426570 Author: Michael Gmelin AuthorDate: 2023-12-20 20:21:55 +0000 Commit: Michael Gmelin CommitDate: 2024-01-28 17:55:56 +0000 libifconfig: Fix bridge status member list When this functionality was moved to libifconfig in 3dfbda3401abea84da9, the end of list calculation was modified for unknown reasons, practically limiting the number of bridge member returned to (about) 102. This patch changes the calculation back to what it was originally and adds a unit test to verify it works as expected. Reported by: Patrick M. Hausen (via ML) Reviewed by: kp Approved by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43135 (cherry picked from commit 3d36053ca6d6a17d408c8f92c504e6135dc9d8df) --- lib/libifconfig/libifconfig_bridge.c | 2 +- tests/sys/net/if_bridge_test.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/libifconfig/libifconfig_bridge.c b/lib/libifconfig/libifconfig_bridge.c index e4db90f373d6..2a9bbc35858b 100644 --- a/lib/libifconfig/libifconfig_bridge.c +++ b/lib/libifconfig/libifconfig_bridge.c @@ -111,7 +111,7 @@ ifconfig_bridge_get_bridge_status(ifconfig_handle_t *h, free(bridge); return (-1); } - if (members.ifbic_len <= len) + if ((members.ifbic_len + sizeof(*members.ifbic_req)) < len) break; } if (buf == NULL) { diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh index cf0c81d6f682..44370a905223 100755 --- a/tests/sys/net/if_bridge_test.sh +++ b/tests/sys/net/if_bridge_test.sh @@ -663,6 +663,33 @@ vlan_cleanup() vnet_cleanup } +atf_test_case "many_bridge_members" "cleanup" +many_bridge_members_head() +{ + atf_set descr 'many_bridge_members ifconfig test' + atf_set require.user root +} + +many_bridge_members_body() +{ + vnet_init + + bridge=$(vnet_mkbridge) + ifcount=256 + for _ in $(seq 1 $ifcount); do + epair=$(vnet_mkepair) + ifconfig "${bridge}" addm "${epair}"a + done + + atf_check -s exit:0 -o inline:"$ifcount\n" \ + sh -c "ifconfig ${bridge} | grep member: | wc -l | xargs" +} + +many_bridge_members_cleanup() +{ + vnet_cleanup +} + atf_init_test_cases() { atf_add_test_case "bridge_transmit_ipv4_unicast" @@ -677,4 +704,5 @@ atf_init_test_cases() atf_add_test_case "gif" atf_add_test_case "mtu" atf_add_test_case "vlan" + atf_add_test_case "many_bridge_members" } From nobody Sun Jan 28 20:05:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMq40h4Qz59Ccc; Sun, 28 Jan 2024 20:05: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 4TNMq35j6zz3xC3; Sun, 28 Jan 2024 20:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6MQ7soP4kB1QxH//pNLpuBkhyoeXOTlc+wICXfxcEPo=; b=ZmENEKfm0aSGjTimXBn5suYdWQrhR/7+EuJe15jHkJyt2U8wfXdPf3z5oJX5jSNBx8rFZl BU3QxSfxr1+2jZy6n1P+WxyprKqP6ADgjU2gkksf1Cshz/tljFURf5cgGRWcTtsBnWsQ/+ 1Oh67/PVjafaNQpWq+OhNZkzmPRBNvSTr3qSzdbF8bDYA++Ak0jPQEjDUUUYzxjw6K1lYD Qin8I7cOsQ5KqklDuBS9SBDuSYWyPckMaX761knoqi790HlLKo+66NwkOhlm0Bm2036Do1 7IEmhqAfE8l+zJ+hnOhD6WiwpkUSxurNAMLOjQXXV+9zeVyYoaubtt8QOM2PbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6MQ7soP4kB1QxH//pNLpuBkhyoeXOTlc+wICXfxcEPo=; b=Wkf7SOj3M5dmCgnQPjgYiNiEJCKvzZEmJDDyVkrZiI7F+sH//tKvlnOrvDWzalrMBWioNz DzcxcemDIB50p4zrlKzUGU62jET86rrwuGqilPdetYdHksWOuTCLRRF4lIWgqlDmfmP3MM jMv9nzop6qgQBmfCQ2JQ70L82XKPsw0ewu9ySneccurLwbBVrsb/Gyp7tQgA4y6xLu70zS Tu30e61p3bwDzXkwOFYGpHHrAKYvo9l8VaU2mLC5Jv1PY06fhpsh9QnOjYKNKRaCrc1MAu mi2o4FAnzIdkW7fAbg6d9YRhqWRbUqBSfj4jIyIjfZmjH0kmqbmo/sLLZWJKAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472303; a=rsa-sha256; cv=none; b=B5Dskip1XFWKqbHXoILjM3u4Q4eRLd6OpxYpIp/ujFxLaag7664py+kh1ubq5Q2NDlpVSp K8v0VfgVwbS01vp/jQh4KZ132vy2dGAdzXYJk12u9VLhknoD4g95jPXs0hsWYEINbImPjV 01WL8tBAR7EnLqsxe+nvP8H4Vl2Y+EIzSf71TP0Ef/V6f6KEz/Sj7Oe5cBNr0r+x7UYtDb H5NQuWxscRYacaFrUsAR41EKXWPcLhZAtx1wCysB3b6yHggqb6qwGKE6J1Um9EUak4oRxD L28z9MaGIiSJn6uGu1jOwHP+lCPIRfBGqXW3jcK1CdiDNLMmZ122wigOCGQg9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMq34n3nzLcs; Sun, 28 Jan 2024 20:05: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 40SK53sc032408; Sun, 28 Jan 2024 20:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK53nt032405; Sun, 28 Jan 2024 20:05:03 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:03 GMT Message-Id: <202401282005.40SK53nt032405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: dcc20bced515 - main - stand: Use modern function definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcc20bced51583df83e49af269ff7be5fb48dbf8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dcc20bced51583df83e49af269ff7be5fb48dbf8 commit dcc20bced51583df83e49af269ff7be5fb48dbf8 Author: Warner Losh AuthorDate: 2024-01-28 18:36:21 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:31 +0000 stand: Use modern function definitions Use modern function definitions for functions with no args. Sponsored by: Netflix --- stand/common/boot.c | 2 +- stand/efi/libefi/efinet.c | 2 +- stand/fdt/fdt_loader_cmd.c | 6 +++--- stand/libofw/ofw_console.c | 4 ++-- stand/libofw/openfirm.c | 8 ++++---- stand/libsa/bzipfs.c | 2 +- stand/libsa/powerpc/syncicache.c | 2 +- stand/uboot/main.c | 2 +- stand/uboot/net.c | 2 +- stand/uboot/uboot_console.c | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/stand/common/boot.c b/stand/common/boot.c index db4bb4fc2ea8..658da097b9a9 100644 --- a/stand/common/boot.c +++ b/stand/common/boot.c @@ -160,7 +160,7 @@ command_autoboot(int argc, char *argv[]) * we haven't tried already, try now. */ void -autoboot_maybe() +autoboot_maybe(void) { char *cp; diff --git a/stand/efi/libefi/efinet.c b/stand/efi/libefi/efinet.c index 62fc203c83b5..97890c9d9b43 100644 --- a/stand/efi/libefi/efinet.c +++ b/stand/efi/libefi/efinet.c @@ -352,7 +352,7 @@ struct devsw efinet_dev = { }; static int -efinet_dev_init() +efinet_dev_init(void) { struct netif_dif *dif; struct netif_stats *stats; diff --git a/stand/fdt/fdt_loader_cmd.c b/stand/fdt/fdt_loader_cmd.c index a27ac53cb13b..eb152ae1949c 100644 --- a/stand/fdt/fdt_loader_cmd.c +++ b/stand/fdt/fdt_loader_cmd.c @@ -111,7 +111,7 @@ static const struct cmdtab commands[] = { static char cwd[FDT_CWD_LEN] = "/"; static vm_offset_t -fdt_find_static_dtb() +fdt_find_static_dtb(void) { Elf_Ehdr *ehdr; Elf_Shdr *shdr; @@ -428,7 +428,7 @@ fdt_check_overlay_compatible(void *base_fdt, void *overlay_fdt) * Returns the number of overlays successfully applied */ int -fdt_apply_overlays() +fdt_apply_overlays(void) { struct preloaded_file *fp; size_t max_overlay_size, next_fdtp_size; @@ -551,7 +551,7 @@ fdt_is_setup(void) } int -fdt_setup_fdtp() +fdt_setup_fdtp(void) { struct preloaded_file *bfp; vm_offset_t va; diff --git a/stand/libofw/ofw_console.c b/stand/libofw/ofw_console.c index 42ff045e8831..b0ead0aba198 100644 --- a/stand/libofw/ofw_console.c +++ b/stand/libofw/ofw_console.c @@ -83,7 +83,7 @@ ofw_cons_putchar(int c) static int saved_char = -1; int -ofw_cons_getchar() +ofw_cons_getchar(void) { unsigned char ch = '\0'; int l; @@ -105,7 +105,7 @@ ofw_cons_getchar() } int -ofw_cons_poll() +ofw_cons_poll(void) { unsigned char ch; diff --git a/stand/libofw/openfirm.c b/stand/libofw/openfirm.c index 211722c08e10..da0f589faa67 100644 --- a/stand/libofw/openfirm.c +++ b/stand/libofw/openfirm.c @@ -135,7 +135,7 @@ OF_test(char *name) /* Return firmware millisecond count. */ int -OF_milliseconds() +OF_milliseconds(void) { static struct { cell_t name; @@ -693,7 +693,7 @@ OF_boot(char *bootspec) /* Suspend and drop back to the Open Firmware interface. */ void -OF_enter() +OF_enter(void) { static struct { cell_t name; @@ -708,7 +708,7 @@ OF_enter() /* Shut down and drop back to the Open Firmware interface. */ void -OF_exit() +OF_exit(void) { static struct { cell_t name; @@ -723,7 +723,7 @@ OF_exit() } void -OF_quiesce() +OF_quiesce(void) { static struct { cell_t name; diff --git a/stand/libsa/bzipfs.c b/stand/libsa/bzipfs.c index 9a14380bae51..ad51e934ed9c 100644 --- a/stand/libsa/bzipfs.c +++ b/stand/libsa/bzipfs.c @@ -366,7 +366,7 @@ bz_internal_error(int errorcode) #ifdef REGRESSION /* Small test case, open and decompress test.bz2 */ -int main() +int main(void) { struct open_file f; char buf[1024]; diff --git a/stand/libsa/powerpc/syncicache.c b/stand/libsa/powerpc/syncicache.c index 0fcb1914a0da..1f99007dcdae 100644 --- a/stand/libsa/powerpc/syncicache.c +++ b/stand/libsa/powerpc/syncicache.c @@ -54,7 +54,7 @@ int cacheline_size = 0; static void getcachelinesize(void); static void -getcachelinesize() +getcachelinesize(void) { static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; int clen; diff --git a/stand/uboot/main.c b/stand/uboot/main.c index 6147757ced71..5a896959122e 100644 --- a/stand/uboot/main.c +++ b/stand/uboot/main.c @@ -339,7 +339,7 @@ get_load_device(int *type, int *unit, int *slice, int *partition) } static void -print_disk_probe_info() +print_disk_probe_info(void) { char slice[32]; char partition[32]; diff --git a/stand/uboot/net.c b/stand/uboot/net.c index 969724ea02df..392dd1ca45c2 100644 --- a/stand/uboot/net.c +++ b/stand/uboot/net.c @@ -100,7 +100,7 @@ static struct uboot_softc uboot_softc; * to obtain all this info again. */ static void -get_env_net_params() +get_env_net_params(void) { char *envstr; in_addr_t rootaddr, serveraddr; diff --git a/stand/uboot/uboot_console.c b/stand/uboot/uboot_console.c index d8819b8193e2..f6656309be6c 100644 --- a/stand/uboot/uboot_console.c +++ b/stand/uboot/uboot_console.c @@ -73,14 +73,14 @@ uboot_cons_putchar(int c) } static int -uboot_cons_getchar() +uboot_cons_getchar(void) { return (ub_getc()); } static int -uboot_cons_poll() +uboot_cons_poll(void) { return (ub_tstc()); From nobody Sun Jan 28 20:05:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMq5020sz59CTP; Sun, 28 Jan 2024 20:05: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 4TNMq466wrz3wsX; Sun, 28 Jan 2024 20:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xg9+wA0c4e4Ztint+iHeLRdaSAAZmziGyZuDuHXqOKA=; b=O/FoCeO/OYNL7uSOtpigTrYt2asY18FcbVtUFeqeKtOJC0dZXPnkt/GR+kev0LpS4M0HyV qM54x02Luf0tsFEDnZYZncHNdqR4y8A8KMr6au7VJcTtYZPgaOmiLV6Tu+rJ7oi0w1z0/B HjmOzA+2RdZpAw9DavD3UlGDUQD3ddZ8jBltgTXU+Oi5gIWAsdGuFkCYA2ynEydipLU3Ho pILOLXonCYYQfyg6g7IcNoVFla1b/9ud7CXX20qAllsDjZHLekDMYyZEMpPH3VhbJeN3PX DEYoKlcgnDLoJqyKO68+JArc1IONo7fpyvlndAE2kHYuOAIRV9f2knpkEBSFUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xg9+wA0c4e4Ztint+iHeLRdaSAAZmziGyZuDuHXqOKA=; b=OOIn9yXxiO4GOl5puSoSC5ubwyNb2dkAA20wQVTABDoP4EbpRLZA4sAGD7auA0DyKnUUbX 35OTmGVGjLFsp61Ayg7amHzVTKdm4ct2bjsIFf10AD2QDWcvgfZWHGq8R9ktzJlGJBwshm HEz39tBgzkVMXYu7q216huI6AjWGluUWaVfyqUA3UQ15ps8AVF1R64gSs61ul3v/Ftn9kM BEaE980ZMmaAmdHS9w5VMVrV6B/wMy4cHD7e4LTqChZpiN0FIwxSbviFkHPF3sC81YKF4S cGAcV+BceEyO4nWXsX0uec2lCK6ACfaF4rZ58gK8LQqgT2fg7GbNZ0mgDmTbOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472304; a=rsa-sha256; cv=none; b=kqUK9xlIwhll1gPfpaIVh+ElmdOZhZ7sRkxZdsZESjM3G4xnFyNrfdF3pyenZugwJrzXIV mjmPOE4Q5HFTpZ63pBlJRCEw6DQawRXF2PSkJpfv1atxxOdDyKVnK5vubFueZ5lKorxB30 CeEmj4hJoN1u7Fc4HqKmuOO6LE3BreIE9HB0+oDIur3mdievOsj6Z+vQYEst5YX2gy8rRP yb4kX89dzoy+9nkZkp/QxDbzFqslc6hD3N49mSc3+47EM4RcBXasekDrfifbsqUilV2l/8 3j3cSo5RIh674q3pieWDnUos/hUtkRD0rJwchs+0DRaI9n0o0NHUgtLlaFd0VQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMq459GQzLct; Sun, 28 Jan 2024 20:05: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 40SK54Ua032456; Sun, 28 Jan 2024 20:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK54mX032453; Sun, 28 Jan 2024 20:05:04 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:04 GMT Message-Id: <202401282005.40SK54mX032453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 091c255b5b27 - main - kboot: Move to kboot/kboot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 091c255b5b279fddf445a42dd7d0bad0e7c213fd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=091c255b5b279fddf445a42dd7d0bad0e7c213fd commit 091c255b5b279fddf445a42dd7d0bad0e7c213fd Author: Warner Losh AuthorDate: 2024-01-28 18:05:05 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:31 +0000 kboot: Move to kboot/kboot In anticipation of separating the library elements from the kboot prorgam elements, move kboot down a level into a subdirectory. There will be libkboot and include directories in subsequent commits, mirroring other subsystems like i386 and efi. Sponsored by: Netflix --- stand/kboot/Makefile | 68 +-------------------- stand/kboot/Makefile.inc | 1 + stand/kboot/kboot/Makefile | 69 ++++++++++++++++++++++ stand/kboot/{ => kboot}/arch/aarch64/Makefile.inc | 0 stand/kboot/{ => kboot}/arch/aarch64/exec.c | 0 stand/kboot/{ => kboot}/arch/aarch64/fdt_arch.c | 0 .../kboot/{ => kboot}/arch/aarch64/host_syscall.S | 0 .../{ => kboot}/arch/aarch64/ldscript.aarch64 | 0 stand/kboot/{ => kboot}/arch/aarch64/load_addr.c | 0 stand/kboot/{ => kboot}/arch/aarch64/start_arch.h | 0 stand/kboot/{ => kboot}/arch/aarch64/stat_arch.h | 0 stand/kboot/{ => kboot}/arch/aarch64/syscall_nr.h | 0 .../kboot/{ => kboot}/arch/aarch64/termios_arch.h | 0 stand/kboot/{ => kboot}/arch/aarch64/tramp.S | 0 stand/kboot/{ => kboot}/arch/amd64/Makefile.inc | 0 stand/kboot/{ => kboot}/arch/amd64/amd64_tramp.S | 0 stand/kboot/{ => kboot}/arch/amd64/elf64_freebsd.c | 0 stand/kboot/{ => kboot}/arch/amd64/fdt_arch.c | 0 stand/kboot/{ => kboot}/arch/amd64/host_syscall.S | 0 stand/kboot/{ => kboot}/arch/amd64/ldscript.amd64 | 0 stand/kboot/{ => kboot}/arch/amd64/load_addr.c | 0 stand/kboot/{ => kboot}/arch/amd64/multiboot2.h | 0 stand/kboot/{ => kboot}/arch/amd64/start_arch.h | 0 stand/kboot/{ => kboot}/arch/amd64/stat_arch.h | 0 stand/kboot/{ => kboot}/arch/amd64/syscall_nr.h | 0 stand/kboot/{ => kboot}/arch/amd64/termios_arch.h | 0 .../kboot/{ => kboot}/arch/powerpc64/Makefile.inc | 0 stand/kboot/{ => kboot}/arch/powerpc64/fdt_arch.c | 0 .../{ => kboot}/arch/powerpc64/host_syscall.S | 0 .../kboot/{ => kboot}/arch/powerpc64/kerneltramp.S | 0 .../{ => kboot}/arch/powerpc64/ldscript.powerpc | 0 stand/kboot/{ => kboot}/arch/powerpc64/load_addr.c | 0 .../{ => kboot}/arch/powerpc64/ppc64_elf_freebsd.c | 0 .../kboot/{ => kboot}/arch/powerpc64/start_arch.h | 0 stand/kboot/{ => kboot}/arch/powerpc64/stat_arch.h | 0 .../kboot/{ => kboot}/arch/powerpc64/syscall_nr.h | 0 .../{ => kboot}/arch/powerpc64/termios_arch.h | 0 stand/kboot/{ => kboot}/conf.c | 0 stand/kboot/{ => kboot}/crt1.c | 0 stand/kboot/{ => kboot}/host_syscall.h | 0 stand/kboot/{ => kboot}/host_syscalls.c | 0 stand/kboot/{ => kboot}/hostcons.c | 0 stand/kboot/{ => kboot}/hostdisk.c | 0 stand/kboot/{ => kboot}/hostfs.c | 0 stand/kboot/{ => kboot}/init.c | 0 stand/kboot/{ => kboot}/kboot.h | 0 stand/kboot/{ => kboot}/kbootfdt.c | 0 stand/kboot/{ => kboot}/main.c | 0 stand/kboot/{ => kboot}/seg.c | 0 stand/kboot/{ => kboot}/termios.c | 0 stand/kboot/{ => kboot}/termios.h | 0 stand/kboot/{ => kboot}/termios_gen.h | 0 stand/kboot/{ => kboot}/util.c | 0 stand/kboot/{ => kboot}/version | 0 54 files changed, 73 insertions(+), 65 deletions(-) diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile index b9d68cddf97d..2e0b9d7a2e09 100644 --- a/stand/kboot/Makefile +++ b/stand/kboot/Makefile @@ -1,69 +1,7 @@ - -LOADER_DISK_SUPPORT?= yes -LOADER_CD9660_SUPPORT?= yes -LOADER_MSDOS_SUPPORT?= no -LOADER_EXT2FS_SUPPORT?= yes -LOADER_UFS_SUPPORT?= yes -LOADER_ZFS_SUPPORT?= yes -LOADER_NET_SUPPORT?= no -LOADER_NFS_SUPPORT?= no -LOADER_TFTP_SUPPORT?= no -LOADER_GZIP_SUPPORT?= no -LOADER_BZIP2_SUPPORT?= no +NO_OBJ=t .include -PROG= loader.kboot -NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH} -INSTALLFLAGS= -b - -# Architecture-specific loader code -SRCS= \ - bootinfo.c \ - conf.c \ - crt1.c \ - gfx_fb_stub.c \ - host_syscalls.c \ - hostcons.c \ - hostdisk.c \ - hostfs.c \ - init.c \ - kbootfdt.c \ - main.c \ - seg.c \ - termios.c \ - util.c \ - vers.c - -CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken -.if ${MK_LOADER_ZFS} != "no" -CFLAGS+= -I${ZFSSRC} -CFLAGS+= -I${SYSDIR}/contrib/openzfs/include -CFLAGS+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs -HAVE_ZFS=yes -.endif - -HELP_FILENAME= loader.help.kboot - -.include "${BOOTSRC}/fdt.mk" - -# We share bootinfo.c with efi -.PATH: ${BOOTSRC}/efi/loader - -# Note: Since we're producing a userland binary, we key off of MACHINE_ARCH -# instead of the more normal MACHINE since the changes between different flavors -# of MACHINE_ARCH are large enough in Linux that it's easier that way. -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH} -.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" - -# Always add MI sources -.include "${BOOTSRC}/loader.mk" -.PATH: ${SYSDIR}/libkern -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} - -CFLAGS+= -Wall - -DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} -LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} +SUBDIR+= kboot -.include +.include diff --git a/stand/kboot/Makefile.inc b/stand/kboot/Makefile.inc new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/stand/kboot/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile new file mode 100644 index 000000000000..b9d68cddf97d --- /dev/null +++ b/stand/kboot/kboot/Makefile @@ -0,0 +1,69 @@ + +LOADER_DISK_SUPPORT?= yes +LOADER_CD9660_SUPPORT?= yes +LOADER_MSDOS_SUPPORT?= no +LOADER_EXT2FS_SUPPORT?= yes +LOADER_UFS_SUPPORT?= yes +LOADER_ZFS_SUPPORT?= yes +LOADER_NET_SUPPORT?= no +LOADER_NFS_SUPPORT?= no +LOADER_TFTP_SUPPORT?= no +LOADER_GZIP_SUPPORT?= no +LOADER_BZIP2_SUPPORT?= no + +.include + +PROG= loader.kboot +NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH} +INSTALLFLAGS= -b + +# Architecture-specific loader code +SRCS= \ + bootinfo.c \ + conf.c \ + crt1.c \ + gfx_fb_stub.c \ + host_syscalls.c \ + hostcons.c \ + hostdisk.c \ + hostfs.c \ + init.c \ + kbootfdt.c \ + main.c \ + seg.c \ + termios.c \ + util.c \ + vers.c + +CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken +.if ${MK_LOADER_ZFS} != "no" +CFLAGS+= -I${ZFSSRC} +CFLAGS+= -I${SYSDIR}/contrib/openzfs/include +CFLAGS+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs +HAVE_ZFS=yes +.endif + +HELP_FILENAME= loader.help.kboot + +.include "${BOOTSRC}/fdt.mk" + +# We share bootinfo.c with efi +.PATH: ${BOOTSRC}/efi/loader + +# Note: Since we're producing a userland binary, we key off of MACHINE_ARCH +# instead of the more normal MACHINE since the changes between different flavors +# of MACHINE_ARCH are large enough in Linux that it's easier that way. +.PATH: ${.CURDIR}/arch/${MACHINE_ARCH} +.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" + +# Always add MI sources +.include "${BOOTSRC}/loader.mk" +.PATH: ${SYSDIR}/libkern +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} + +CFLAGS+= -Wall + +DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} +LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} + +.include diff --git a/stand/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc similarity index 100% rename from stand/kboot/arch/aarch64/Makefile.inc rename to stand/kboot/kboot/arch/aarch64/Makefile.inc diff --git a/stand/kboot/arch/aarch64/exec.c b/stand/kboot/kboot/arch/aarch64/exec.c similarity index 100% rename from stand/kboot/arch/aarch64/exec.c rename to stand/kboot/kboot/arch/aarch64/exec.c diff --git a/stand/kboot/arch/aarch64/fdt_arch.c b/stand/kboot/kboot/arch/aarch64/fdt_arch.c similarity index 100% rename from stand/kboot/arch/aarch64/fdt_arch.c rename to stand/kboot/kboot/arch/aarch64/fdt_arch.c diff --git a/stand/kboot/arch/aarch64/host_syscall.S b/stand/kboot/kboot/arch/aarch64/host_syscall.S similarity index 100% rename from stand/kboot/arch/aarch64/host_syscall.S rename to stand/kboot/kboot/arch/aarch64/host_syscall.S diff --git a/stand/kboot/arch/aarch64/ldscript.aarch64 b/stand/kboot/kboot/arch/aarch64/ldscript.aarch64 similarity index 100% rename from stand/kboot/arch/aarch64/ldscript.aarch64 rename to stand/kboot/kboot/arch/aarch64/ldscript.aarch64 diff --git a/stand/kboot/arch/aarch64/load_addr.c b/stand/kboot/kboot/arch/aarch64/load_addr.c similarity index 100% rename from stand/kboot/arch/aarch64/load_addr.c rename to stand/kboot/kboot/arch/aarch64/load_addr.c diff --git a/stand/kboot/arch/aarch64/start_arch.h b/stand/kboot/kboot/arch/aarch64/start_arch.h similarity index 100% rename from stand/kboot/arch/aarch64/start_arch.h rename to stand/kboot/kboot/arch/aarch64/start_arch.h diff --git a/stand/kboot/arch/aarch64/stat_arch.h b/stand/kboot/kboot/arch/aarch64/stat_arch.h similarity index 100% rename from stand/kboot/arch/aarch64/stat_arch.h rename to stand/kboot/kboot/arch/aarch64/stat_arch.h diff --git a/stand/kboot/arch/aarch64/syscall_nr.h b/stand/kboot/kboot/arch/aarch64/syscall_nr.h similarity index 100% rename from stand/kboot/arch/aarch64/syscall_nr.h rename to stand/kboot/kboot/arch/aarch64/syscall_nr.h diff --git a/stand/kboot/arch/aarch64/termios_arch.h b/stand/kboot/kboot/arch/aarch64/termios_arch.h similarity index 100% rename from stand/kboot/arch/aarch64/termios_arch.h rename to stand/kboot/kboot/arch/aarch64/termios_arch.h diff --git a/stand/kboot/arch/aarch64/tramp.S b/stand/kboot/kboot/arch/aarch64/tramp.S similarity index 100% rename from stand/kboot/arch/aarch64/tramp.S rename to stand/kboot/kboot/arch/aarch64/tramp.S diff --git a/stand/kboot/arch/amd64/Makefile.inc b/stand/kboot/kboot/arch/amd64/Makefile.inc similarity index 100% rename from stand/kboot/arch/amd64/Makefile.inc rename to stand/kboot/kboot/arch/amd64/Makefile.inc diff --git a/stand/kboot/arch/amd64/amd64_tramp.S b/stand/kboot/kboot/arch/amd64/amd64_tramp.S similarity index 100% rename from stand/kboot/arch/amd64/amd64_tramp.S rename to stand/kboot/kboot/arch/amd64/amd64_tramp.S diff --git a/stand/kboot/arch/amd64/elf64_freebsd.c b/stand/kboot/kboot/arch/amd64/elf64_freebsd.c similarity index 100% rename from stand/kboot/arch/amd64/elf64_freebsd.c rename to stand/kboot/kboot/arch/amd64/elf64_freebsd.c diff --git a/stand/kboot/arch/amd64/fdt_arch.c b/stand/kboot/kboot/arch/amd64/fdt_arch.c similarity index 100% rename from stand/kboot/arch/amd64/fdt_arch.c rename to stand/kboot/kboot/arch/amd64/fdt_arch.c diff --git a/stand/kboot/arch/amd64/host_syscall.S b/stand/kboot/kboot/arch/amd64/host_syscall.S similarity index 100% rename from stand/kboot/arch/amd64/host_syscall.S rename to stand/kboot/kboot/arch/amd64/host_syscall.S diff --git a/stand/kboot/arch/amd64/ldscript.amd64 b/stand/kboot/kboot/arch/amd64/ldscript.amd64 similarity index 100% rename from stand/kboot/arch/amd64/ldscript.amd64 rename to stand/kboot/kboot/arch/amd64/ldscript.amd64 diff --git a/stand/kboot/arch/amd64/load_addr.c b/stand/kboot/kboot/arch/amd64/load_addr.c similarity index 100% rename from stand/kboot/arch/amd64/load_addr.c rename to stand/kboot/kboot/arch/amd64/load_addr.c diff --git a/stand/kboot/arch/amd64/multiboot2.h b/stand/kboot/kboot/arch/amd64/multiboot2.h similarity index 100% rename from stand/kboot/arch/amd64/multiboot2.h rename to stand/kboot/kboot/arch/amd64/multiboot2.h diff --git a/stand/kboot/arch/amd64/start_arch.h b/stand/kboot/kboot/arch/amd64/start_arch.h similarity index 100% rename from stand/kboot/arch/amd64/start_arch.h rename to stand/kboot/kboot/arch/amd64/start_arch.h diff --git a/stand/kboot/arch/amd64/stat_arch.h b/stand/kboot/kboot/arch/amd64/stat_arch.h similarity index 100% rename from stand/kboot/arch/amd64/stat_arch.h rename to stand/kboot/kboot/arch/amd64/stat_arch.h diff --git a/stand/kboot/arch/amd64/syscall_nr.h b/stand/kboot/kboot/arch/amd64/syscall_nr.h similarity index 100% rename from stand/kboot/arch/amd64/syscall_nr.h rename to stand/kboot/kboot/arch/amd64/syscall_nr.h diff --git a/stand/kboot/arch/amd64/termios_arch.h b/stand/kboot/kboot/arch/amd64/termios_arch.h similarity index 100% rename from stand/kboot/arch/amd64/termios_arch.h rename to stand/kboot/kboot/arch/amd64/termios_arch.h diff --git a/stand/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/kboot/arch/powerpc64/Makefile.inc similarity index 100% rename from stand/kboot/arch/powerpc64/Makefile.inc rename to stand/kboot/kboot/arch/powerpc64/Makefile.inc diff --git a/stand/kboot/arch/powerpc64/fdt_arch.c b/stand/kboot/kboot/arch/powerpc64/fdt_arch.c similarity index 100% rename from stand/kboot/arch/powerpc64/fdt_arch.c rename to stand/kboot/kboot/arch/powerpc64/fdt_arch.c diff --git a/stand/kboot/arch/powerpc64/host_syscall.S b/stand/kboot/kboot/arch/powerpc64/host_syscall.S similarity index 100% rename from stand/kboot/arch/powerpc64/host_syscall.S rename to stand/kboot/kboot/arch/powerpc64/host_syscall.S diff --git a/stand/kboot/arch/powerpc64/kerneltramp.S b/stand/kboot/kboot/arch/powerpc64/kerneltramp.S similarity index 100% rename from stand/kboot/arch/powerpc64/kerneltramp.S rename to stand/kboot/kboot/arch/powerpc64/kerneltramp.S diff --git a/stand/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/kboot/arch/powerpc64/ldscript.powerpc similarity index 100% rename from stand/kboot/arch/powerpc64/ldscript.powerpc rename to stand/kboot/kboot/arch/powerpc64/ldscript.powerpc diff --git a/stand/kboot/arch/powerpc64/load_addr.c b/stand/kboot/kboot/arch/powerpc64/load_addr.c similarity index 100% rename from stand/kboot/arch/powerpc64/load_addr.c rename to stand/kboot/kboot/arch/powerpc64/load_addr.c diff --git a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c similarity index 100% rename from stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c rename to stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c diff --git a/stand/kboot/arch/powerpc64/start_arch.h b/stand/kboot/kboot/arch/powerpc64/start_arch.h similarity index 100% rename from stand/kboot/arch/powerpc64/start_arch.h rename to stand/kboot/kboot/arch/powerpc64/start_arch.h diff --git a/stand/kboot/arch/powerpc64/stat_arch.h b/stand/kboot/kboot/arch/powerpc64/stat_arch.h similarity index 100% rename from stand/kboot/arch/powerpc64/stat_arch.h rename to stand/kboot/kboot/arch/powerpc64/stat_arch.h diff --git a/stand/kboot/arch/powerpc64/syscall_nr.h b/stand/kboot/kboot/arch/powerpc64/syscall_nr.h similarity index 100% rename from stand/kboot/arch/powerpc64/syscall_nr.h rename to stand/kboot/kboot/arch/powerpc64/syscall_nr.h diff --git a/stand/kboot/arch/powerpc64/termios_arch.h b/stand/kboot/kboot/arch/powerpc64/termios_arch.h similarity index 100% rename from stand/kboot/arch/powerpc64/termios_arch.h rename to stand/kboot/kboot/arch/powerpc64/termios_arch.h diff --git a/stand/kboot/conf.c b/stand/kboot/kboot/conf.c similarity index 100% rename from stand/kboot/conf.c rename to stand/kboot/kboot/conf.c diff --git a/stand/kboot/crt1.c b/stand/kboot/kboot/crt1.c similarity index 100% rename from stand/kboot/crt1.c rename to stand/kboot/kboot/crt1.c diff --git a/stand/kboot/host_syscall.h b/stand/kboot/kboot/host_syscall.h similarity index 100% rename from stand/kboot/host_syscall.h rename to stand/kboot/kboot/host_syscall.h diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/kboot/host_syscalls.c similarity index 100% rename from stand/kboot/host_syscalls.c rename to stand/kboot/kboot/host_syscalls.c diff --git a/stand/kboot/hostcons.c b/stand/kboot/kboot/hostcons.c similarity index 100% rename from stand/kboot/hostcons.c rename to stand/kboot/kboot/hostcons.c diff --git a/stand/kboot/hostdisk.c b/stand/kboot/kboot/hostdisk.c similarity index 100% rename from stand/kboot/hostdisk.c rename to stand/kboot/kboot/hostdisk.c diff --git a/stand/kboot/hostfs.c b/stand/kboot/kboot/hostfs.c similarity index 100% rename from stand/kboot/hostfs.c rename to stand/kboot/kboot/hostfs.c diff --git a/stand/kboot/init.c b/stand/kboot/kboot/init.c similarity index 100% rename from stand/kboot/init.c rename to stand/kboot/kboot/init.c diff --git a/stand/kboot/kboot.h b/stand/kboot/kboot/kboot.h similarity index 100% rename from stand/kboot/kboot.h rename to stand/kboot/kboot/kboot.h diff --git a/stand/kboot/kbootfdt.c b/stand/kboot/kboot/kbootfdt.c similarity index 100% rename from stand/kboot/kbootfdt.c rename to stand/kboot/kboot/kbootfdt.c diff --git a/stand/kboot/main.c b/stand/kboot/kboot/main.c similarity index 100% rename from stand/kboot/main.c rename to stand/kboot/kboot/main.c diff --git a/stand/kboot/seg.c b/stand/kboot/kboot/seg.c similarity index 100% rename from stand/kboot/seg.c rename to stand/kboot/kboot/seg.c diff --git a/stand/kboot/termios.c b/stand/kboot/kboot/termios.c similarity index 100% rename from stand/kboot/termios.c rename to stand/kboot/kboot/termios.c diff --git a/stand/kboot/termios.h b/stand/kboot/kboot/termios.h similarity index 100% rename from stand/kboot/termios.h rename to stand/kboot/kboot/termios.h diff --git a/stand/kboot/termios_gen.h b/stand/kboot/kboot/termios_gen.h similarity index 100% rename from stand/kboot/termios_gen.h rename to stand/kboot/kboot/termios_gen.h diff --git a/stand/kboot/util.c b/stand/kboot/kboot/util.c similarity index 100% rename from stand/kboot/util.c rename to stand/kboot/kboot/util.c diff --git a/stand/kboot/version b/stand/kboot/kboot/version similarity index 100% rename from stand/kboot/version rename to stand/kboot/kboot/version From nobody Sun Jan 28 20:05:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMq60mnpz59CTS; Sun, 28 Jan 2024 20:05: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 4TNMq574WJz3wsf; Sun, 28 Jan 2024 20:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rT5Kwy0BbcWPx/8y68bM2Nrx1nPf5itgY2jCLlTmzn4=; b=R+P3Mm4SCxuUo1A0SSxbQrU9YDRuY6mrHdwoQraDdi7VF9iot86wt2N/FsTNnPjROGBEOD Y3dwte/rlKZehp8yDmE+OxpTxx0GUqfHpD0RVSkDEzx3NZWscpjUtU5d4+pmlcHitriqzs CCWQmFTTgnua5HOsUl/ED6sIp8JRusRfFZs+ZKdXH0odKQYGuoe1wJMNpkPeflfh4/8tsF RDEJ2uQd8xilwnlQG/+hc5e4s5mlt8Zavdhx39ci7K0Gi3G+OlAvun5BMEd3VGf01fWu3o SaVpaKVo3yrd5ZE3fvrU0XfyqWmZ2DNmbzA2v5uAjo7GXLaGHBZT5gnRGshabw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rT5Kwy0BbcWPx/8y68bM2Nrx1nPf5itgY2jCLlTmzn4=; b=Xy0jND57nXvjOLVSihlH15lQSjht8sGmg40K4DtcPvMGVMkPsZSN0BEX7hWXT+TH5L2wrY VU32INBgiJ/emb5tLbpJz1LfOcyNjA8Ue2bdPw3uuMLfRDrqbuuobmvuz/+pEMuk6SMdaw LzBClEToaNT0LULmvW2MA/xaf4meD0zo8JJw0SKgE0KJi0xvFXgcXgWzogjVEHpPtqFpsr HZjmAM4S4dcypsXJ/ILZuEBgO0sM4g6+ce37SSBTfBs2bI8De2z6V2FUg14T5lOJcW2Iyu mHyyWb5NEDXyM7mQ6rkXQE6C4lph+fzift4fkdIMEzLERBR4ABqqDrqHalG1Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472306; a=rsa-sha256; cv=none; b=oxZK0iBdaCnzm2Wjt4XVKa5jWWGFx9OnsxhnpQQxsehFORx9YdiV4hHBEWCzcvFn/gWjkW 1iPj//ZkMMss+X0wWzARXK9/LpBgeExNr9ZmHYbbvvxyZAgChhOMqlEd493j0YUHuxjOpl IlJBly43GXXJY9v2NcRhAxyZc5UYhLIpSOhZZ2LE8CV1fF3h7jsbX+uS6YiZeQpEyYeUxJ IKpJWrT+yObRoblop7GfvvJzfp9P2u+mkYfgayG9YZP/s5AlQuYDH0TVxAit6zdQigYBk+ Q5GFopvNbnHLsflT+WhNeM6JX3nb53bDeZMvt+p26FVsWI8z73i96nnJRSuwdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMq569thzLcv; Sun, 28 Jan 2024 20:05: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 40SK55s7032510; Sun, 28 Jan 2024 20:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK55oB032507; Sun, 28 Jan 2024 20:05:05 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:05 GMT Message-Id: <202401282005.40SK55oB032507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a03411e84728 - main - kboot: Move _start out of kboot and into libkboot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a03411e84728e9b267056fd31c7d1d9d1dc1b01e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a03411e84728e9b267056fd31c7d1d9d1dc1b01e commit a03411e84728e9b267056fd31c7d1d9d1dc1b01e Author: Warner Losh AuthorDate: 2024-01-28 18:53:59 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:31 +0000 kboot: Move _start out of kboot and into libkboot Move the startup code from kboot/kboot to kboot/libkboot and add the necessary infrastructure for it to build. move start_arch.h, a private header for libkboot, over as well. Sponsored by: Netflix --- stand/kboot/Makefile | 2 +- stand/kboot/Makefile.inc | 6 ++++++ stand/kboot/kboot/Makefile | 5 ++--- stand/kboot/libkboot/Makefile | 10 ++++++++++ stand/kboot/{kboot => libkboot}/arch/aarch64/start_arch.h | 0 stand/kboot/{kboot => libkboot}/arch/amd64/start_arch.h | 0 stand/kboot/{kboot => libkboot}/arch/powerpc64/start_arch.h | 0 stand/kboot/{kboot => libkboot}/crt1.c | 0 8 files changed, 19 insertions(+), 4 deletions(-) diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile index 2e0b9d7a2e09..72dbabc00568 100644 --- a/stand/kboot/Makefile +++ b/stand/kboot/Makefile @@ -2,6 +2,6 @@ NO_OBJ=t .include -SUBDIR+= kboot +SUBDIR+= libkboot .WAIT kboot .include diff --git a/stand/kboot/Makefile.inc b/stand/kboot/Makefile.inc index 01b5f23410c8..02aecdad55f1 100644 --- a/stand/kboot/Makefile.inc +++ b/stand/kboot/Makefile.inc @@ -1 +1,7 @@ +# Bring in the mini-libc that we wrote + +KBOOTSRC=${BOOTSRC}/kboot +CFLAGS+=-I${KBOOTSRC}/include +LIBKBOOT=${BOOTOBJ}/kboot/libkboot/libkboot.a + .include "../Makefile.inc" diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index b9d68cddf97d..4054bb1da9f2 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -21,7 +21,6 @@ INSTALLFLAGS= -b SRCS= \ bootinfo.c \ conf.c \ - crt1.c \ gfx_fb_stub.c \ host_syscalls.c \ hostcons.c \ @@ -63,7 +62,7 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} CFLAGS+= -Wall -DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} -LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} +DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT} +LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT} .include diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile new file mode 100644 index 000000000000..415571617d2a --- /dev/null +++ b/stand/kboot/libkboot/Makefile @@ -0,0 +1,10 @@ +.include + +LIB= kboot +WARNS?= 4 + +CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} + +SRCS= crt1.c + +.include diff --git a/stand/kboot/kboot/arch/aarch64/start_arch.h b/stand/kboot/libkboot/arch/aarch64/start_arch.h similarity index 100% rename from stand/kboot/kboot/arch/aarch64/start_arch.h rename to stand/kboot/libkboot/arch/aarch64/start_arch.h diff --git a/stand/kboot/kboot/arch/amd64/start_arch.h b/stand/kboot/libkboot/arch/amd64/start_arch.h similarity index 100% rename from stand/kboot/kboot/arch/amd64/start_arch.h rename to stand/kboot/libkboot/arch/amd64/start_arch.h diff --git a/stand/kboot/kboot/arch/powerpc64/start_arch.h b/stand/kboot/libkboot/arch/powerpc64/start_arch.h similarity index 100% rename from stand/kboot/kboot/arch/powerpc64/start_arch.h rename to stand/kboot/libkboot/arch/powerpc64/start_arch.h diff --git a/stand/kboot/kboot/crt1.c b/stand/kboot/libkboot/crt1.c similarity index 100% rename from stand/kboot/kboot/crt1.c rename to stand/kboot/libkboot/crt1.c From nobody Sun Jan 28 20:05:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMq72Pg9z59CTT; Sun, 28 Jan 2024 20:05: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 4TNMq70mKsz3x9p; Sun, 28 Jan 2024 20:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsNX6+1WzyXPfLHIhOcR5g19/NVzbObcMU2UA5YFyZU=; b=i6A7XngDFw9T6Gmh9YnCStz14OmO5ZXCL5hYH+CBn5bSNJ8iRRBqkBjUuo0zEoMJXMOPJb gClNqEAWYcVBboTj1zxdfDDoYaEJp+EVHxM/2Vj3ZtEmkotEcLwLbFqxMC+3T8ewQ8WrxH ldZATYfyaIrNJYyS+RMY/iBCzKkRz41AkTpKsRvLDt7tsVtE3kWxrJ/SfvBKT2THL9DHOZ Q97G6wpoxCQBYqglLoWREpWSU4xdZBZJiUyxxAy0ANsVe3mq+2uSKF+8rhPhB54LzRs5vf 7dQmgRHDM08rk8XQhhDbqaUEVvS3W5PPl734dpRWZTDEb0cZa8hl5LlY1I+vyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsNX6+1WzyXPfLHIhOcR5g19/NVzbObcMU2UA5YFyZU=; b=jQcr/t9tGwx21WEZngMVH5SAxwbLRfu2+zYi9UWvJ0drs6KnTZRMoYgH9oaRZ9ekbg9rJq 8Rk3R8bMQ9ou/4RatAucHox3Y/Yga/vUwc2AARUoiV5ipaip2lxEDbYZ0Svp57er/b05z0 1pdt7j9jSi9pIjfNjugAK5ghx0q3ncfedcGU9XX+NywiY8+vgKiPtsEsFMHdDJP2TCZI31 nq3skF033g7V3qGEZB7CpXUf+LE/0bnvt4M3oYnr0JhX+lAdu441KXAjqAKoYwOEgo5x5+ xR9IHoEwCDnluaNCweiduAIojeW4VQo2hNoyvROxlHimI2MFchJerL21/Fyy1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472307; a=rsa-sha256; cv=none; b=RQhXhBhLDbsgwQEOXxv+EQusSIPV011QUCDW+2VjrPOdTF4MeVLPkSYMg/jps9b4AJCPa6 FdGph2k8/c6i9AMVi4iXVHczMRnlUeOMEKwllZeng1ls2dKuEjad33v20XErSDS5TWG4r4 No5ZJ1PCyfr8QgdqkyyUbO5nG+MT3Dwld+MgEqIAbzijED5m/jWxkRJsUzYSO/Bbi2TzyI s3NaBdh+2OMTaxLF1aRm+o5w6dooniyytl86Cc5gKl+JWZS7UI5REfEbGhFnLSMsL/DijB SKq6WRnpNwxMFUuYM/ToYwl/6W92cPPJwHGKE77D9OrTXWP1lou2fwzB5QiVLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMq66zMJzLwt; Sun, 28 Jan 2024 20:05: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 40SK56dJ032550; Sun, 28 Jan 2024 20:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK56IB032547; Sun, 28 Jan 2024 20:05:06 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:06 GMT Message-Id: <202401282005.40SK56IB032547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4aabaa1890e9 - main - kboot: Cleanup libkern reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4aabaa1890e927ed3dd34ccc4642268ea6a505ce Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4aabaa1890e927ed3dd34ccc4642268ea6a505ce commit 4aabaa1890e927ed3dd34ccc4642268ea6a505ce Author: Warner Losh AuthorDate: 2024-01-28 18:28:05 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:31 +0000 kboot: Cleanup libkern reference For aarch64 and amd64, we don't pull in anything from libkern, so we don't need it in our path. However, powerpc needs ucmpdi2 from libkern, so bring it into libkboot's build and omit it from loader.kboot. Sponsored by: Netflix --- stand/kboot/kboot/Makefile | 1 - stand/kboot/kboot/arch/powerpc64/Makefile.inc | 3 +-- stand/kboot/libkboot/Makefile | 2 ++ stand/kboot/libkboot/arch/powerpc64/Makefile.inc | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index 4054bb1da9f2..ae32d878a3f4 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -57,7 +57,6 @@ HELP_FILENAME= loader.help.kboot # Always add MI sources .include "${BOOTSRC}/loader.mk" -.PATH: ${SYSDIR}/libkern CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} CFLAGS+= -Wall diff --git a/stand/kboot/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/kboot/arch/powerpc64/Makefile.inc index c29e69970505..338d1222ab65 100644 --- a/stand/kboot/kboot/arch/powerpc64/Makefile.inc +++ b/stand/kboot/kboot/arch/powerpc64/Makefile.inc @@ -1,7 +1,6 @@ CFLAGS+= -mcpu=powerpc64 -SRCS+= ppc64_elf_freebsd.c host_syscall.S kerneltramp.S load_addr.c fdt_arch.c -SRCS+= ucmpdi2.c +SRCS+= ppc64_elf_freebsd.c kerneltramp.S load_addr.c fdt_arch.c LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile index 415571617d2a..1b030ccfe018 100644 --- a/stand/kboot/libkboot/Makefile +++ b/stand/kboot/libkboot/Makefile @@ -7,4 +7,6 @@ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} SRCS= crt1.c +.sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" + .include diff --git a/stand/kboot/libkboot/arch/powerpc64/Makefile.inc b/stand/kboot/libkboot/arch/powerpc64/Makefile.inc new file mode 100644 index 000000000000..4cafaee28847 --- /dev/null +++ b/stand/kboot/libkboot/arch/powerpc64/Makefile.inc @@ -0,0 +1,4 @@ +CFLAGS+= -mcpu=powerpc64 + +.PATH: ${SYSDIR}/libkern +SRCS+= ucmpdi2.c From nobody Sun Jan 28 20:05:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMq83Tkbz59Cch; Sun, 28 Jan 2024 20:05: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 4TNMq81zjXz3xCZ; Sun, 28 Jan 2024 20:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSsN3SfOKF80A6TTNm/JQC4bHCKunzMwKeswL02HYl8=; b=eXIOTp2KFlXYDVEQuc4PQmAfPFBjF1j2K22GBKndZHv4WUOP//HrWGd+9B9IHO5f6iqTnl Wx+KYbxN8YRoeZEx20c9+liLuBcdTH0u1jLOFKES0rRwCZgOLQ9XpOjYQZIpNxPGXFBwkH 4IFdGa5f/gMpybe46U1+tVcbYsOIN3iTkUChGSnIv0KrsMVW/s7+TQNLYpYpZ/sOm3pDna qUL7uirLtDy78lyd4ZSOKBjQ1+Rfil1QlaKi8yt8IxY4TqDyXLu6nVPb/VIE+Aig2uY141 BbjiYL8gI2m8Jfk6TzLOhvi0Ml8+fu60+nHz6Aqx+b/u+lKI8Dj1A8ocMFKdcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSsN3SfOKF80A6TTNm/JQC4bHCKunzMwKeswL02HYl8=; b=RClBxU3jZyCNT1P4ypYJoefngsoeGVl5+eXwRq7b81P4ORtjiAG8S4XAoLct/FGvO/dHFO I/uxhT/N63j5TZjsxX4yt7P1ErF5cbxVHq8vOSposQ/EEBoOCtHpv38cE1TSBvtEuXKQeI 4pjc1yEJaZY8P5WG1NRQ6KX//vnD9C8B2Bv7x64ru6z5yd9aSG6DqS4nTiE2YyKKRnrYuu F9btCnRehX+orV7Zyr0TkugFCL9WA9VAtAExkDJRbjf/3JCqV7cgrKry9Y1kG74YAlw4n2 6MLlMW7QDoL4KteKFZDCCE7Or2BqXsDm5V/hxL0rlrYp4Q7r4+cOzBL8j3JJjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472308; a=rsa-sha256; cv=none; b=r6yt6BOZC9MSQDT9f97jnn76Lsr/uFh/pfJy6u7BAgqgCiIvreef+ykuzVZE2e/ce6hGBg Oyyp6sBv74t9qIJBMBsfClIz2embUOpNlWf96EL9YbT0kOvSNDaKpzDmHbBZu94tyAfIR7 2jF68HZ9MUpSxtfNxN+nnzcc7sRRpGsUif4QAo7s6rLt7LibfxlXrxVscKdUgRrz1LZHVw 0TrDkWow6oObFXtry8plkEGO00vmAKPKyZFhje2jm9vSQDorU1bypBi6ICicQwcypp38su AdaJykY9aCg1N5X+TQZaFcVs1tONeeKa8w72/KkQiWvTTMInCIN2M3PZL1gNrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMq80wQzzLwv; Sun, 28 Jan 2024 20:05: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 40SK58b7032595; Sun, 28 Jan 2024 20:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK58u8032592; Sun, 28 Jan 2024 20:05:08 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:08 GMT Message-Id: <202401282005.40SK58u8032592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 099335814d5a - main - kboot: Move syscall stubs to libkboot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 099335814d5aafefb3603b1a0901a1432895455c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=099335814d5aafefb3603b1a0901a1432895455c commit 099335814d5aafefb3603b1a0901a1432895455c Author: Warner Losh AuthorDate: 2024-01-28 19:34:13 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:31 +0000 kboot: Move syscall stubs to libkboot Sponsored by: Netflix --- stand/kboot/kboot/arch/aarch64/Makefile.inc | 2 +- stand/kboot/kboot/arch/amd64/Makefile.inc | 2 +- stand/kboot/libkboot/Makefile | 4 +++- stand/kboot/{kboot => libkboot}/arch/aarch64/host_syscall.S | 0 stand/kboot/{kboot => libkboot}/arch/amd64/host_syscall.S | 0 stand/kboot/{kboot => libkboot}/arch/powerpc64/host_syscall.S | 0 6 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stand/kboot/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc index 50388d38dbf2..744a15f363d3 100644 --- a/stand/kboot/kboot/arch/aarch64/Makefile.inc +++ b/stand/kboot/kboot/arch/aarch64/Makefile.inc @@ -1,4 +1,4 @@ -SRCS+= host_syscall.S tramp.S exec.c load_addr.c fdt_arch.c +SRCS+= tramp.S exec.c load_addr.c fdt_arch.c .PATH: ${BOOTSRC}/arm64/libarm64 CFLAGS+=-I${BOOTSRC}/arm64/libarm64 diff --git a/stand/kboot/kboot/arch/amd64/Makefile.inc b/stand/kboot/kboot/arch/amd64/Makefile.inc index fdd40fe9bc5a..55b1819ccdee 100644 --- a/stand/kboot/kboot/arch/amd64/Makefile.inc +++ b/stand/kboot/kboot/arch/amd64/Makefile.inc @@ -1,4 +1,4 @@ -SRCS+= host_syscall.S amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c +SRCS+= amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile index 1b030ccfe018..31f4827e64b9 100644 --- a/stand/kboot/libkboot/Makefile +++ b/stand/kboot/libkboot/Makefile @@ -3,9 +3,11 @@ LIB= kboot WARNS?= 4 +.PATH: ${.CURDIR}/arch/${MACHINE_ARCH} CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} -SRCS= crt1.c +SRCS= crt1.c \ + host_syscall.S .sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" diff --git a/stand/kboot/kboot/arch/aarch64/host_syscall.S b/stand/kboot/libkboot/arch/aarch64/host_syscall.S similarity index 100% rename from stand/kboot/kboot/arch/aarch64/host_syscall.S rename to stand/kboot/libkboot/arch/aarch64/host_syscall.S diff --git a/stand/kboot/kboot/arch/amd64/host_syscall.S b/stand/kboot/libkboot/arch/amd64/host_syscall.S similarity index 100% rename from stand/kboot/kboot/arch/amd64/host_syscall.S rename to stand/kboot/libkboot/arch/amd64/host_syscall.S diff --git a/stand/kboot/kboot/arch/powerpc64/host_syscall.S b/stand/kboot/libkboot/arch/powerpc64/host_syscall.S similarity index 100% rename from stand/kboot/kboot/arch/powerpc64/host_syscall.S rename to stand/kboot/libkboot/arch/powerpc64/host_syscall.S From nobody Sun Jan 28 20:05:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMq94MG3z59Ccl; Sun, 28 Jan 2024 20:05: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 4TNMq9306nz3x5H; Sun, 28 Jan 2024 20:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QaDmvErduX6HCYuieEiQEcKr/kk2AcrTpQQp6MqcJtw=; b=aioASrbaQEmTAoeU6cc5mKxSXj44M/NGLkqWnSrktQjaqhrALnJh2W/4Abrf0RWFrR7gOr 3/Hgmg5O2gf+PHorPrtBSEulU4KvXrRrlZzP8TkhoW/YcbjXYssMmhlUnb3EzXnJcX1A/V GAMy10mBk4gx8TQmmjwHt0z6VeOG8/Q4N0EwXwwWj23wzlQDGHrV73iqA1X68CY9S9rIPH pmJkMYiWSAyr0TNYJgLsAtNWbsr8FuFSJ6I6WanIhCVBlixPdLFO2Fx7O1x52lilYtrmfm fs9VcAicM0oUj1FJIdwGgBFd6Nq3m32v0ESPRL2phqlfKi++ZAkRPPOHTtgPQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QaDmvErduX6HCYuieEiQEcKr/kk2AcrTpQQp6MqcJtw=; b=pvW9COLGWAMiL/twP5Jh9y5Oc1i8Rd666IsVr8mTD6qGaVSXelwr7eHzVF/pBiawg7C5bv L+tQM1CGnPXpw0ISwRyAnAjPGPDu3S8cN6MkjGNU6GrAho0LnGm7SLnThWk2wkJ9rx5q62 XBipP+nNBBjd18i4ygYjGw+dhmFBPrCs3WqWC7cFg25VvXYEMqXEWK/13Uk5sRx8EBUKzA xjVt7Wno273YW4n5oo7mc+KTeSbDJ1Rl2DcPFWb6GZg7EUWWvVnbSMkcW9QgOr+lon596g oDHGCxLDkvLLcez8EwGi31pHcKtNH2/mu/TVVPqWrLqsq7E+GrDKkhZviP7W/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472309; a=rsa-sha256; cv=none; b=INcyTtxjDnxCmKMlGrDYe5evUmpq4/5WxqeKHdsZjk8oygxBb01lbf3tiwEFxdxiFVU12h kIWvidu+Ni48ECsc2mckQ2+Jv+dx2li1YUab44ehqudRHuSu9jSIpXQZCM8Qx3zssEj2+3 7SlAm0+ZOzM8F0iZt89eIO/MEcHLMHsj9fSePk9xeF0HU7kqUhNvXbnZ9GgZUr+mVU0Hop vK6+KnL++wTJ8ulKzFNaD1cnWIfXZfnK2rfIVzyIpcut4d4xDplQ5EHTMTem9Pe9O1E9tl iy1FL+y9aJ5s6khwyl4Y0JCu3TVGGHh8DK0QZ4E8BUSL1GS+0OD1Ym7Q2JJang== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMq91qG2zLww; Sun, 28 Jan 2024 20:05: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 40SK59Cb032640; Sun, 28 Jan 2024 20:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK59bL032637; Sun, 28 Jan 2024 20:05:09 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:09 GMT Message-Id: <202401282005.40SK59bL032637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2e3f49888ec8 - main - kboot: Move system calls to libkboot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e3f49888ec8851bafb22011533217487764fdb0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2e3f49888ec8851bafb22011533217487764fdb0 commit 2e3f49888ec8851bafb22011533217487764fdb0 Author: Warner Losh AuthorDate: 2024-01-28 19:08:45 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:31 +0000 kboot: Move system calls to libkboot Sponsored by: Netflix --- stand/kboot/Makefile.inc | 2 +- stand/kboot/{kboot => include}/arch/aarch64/stat_arch.h | 0 stand/kboot/{kboot => include}/arch/aarch64/syscall_nr.h | 0 stand/kboot/{kboot => include}/arch/amd64/stat_arch.h | 0 stand/kboot/{kboot => include}/arch/amd64/syscall_nr.h | 0 stand/kboot/{kboot => include}/arch/powerpc64/stat_arch.h | 0 stand/kboot/{kboot => include}/arch/powerpc64/syscall_nr.h | 0 stand/kboot/{kboot => include}/host_syscall.h | 0 stand/kboot/kboot/Makefile | 1 - stand/kboot/libkboot/Makefile | 3 ++- stand/kboot/{kboot => libkboot}/host_syscalls.c | 0 11 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/kboot/Makefile.inc b/stand/kboot/Makefile.inc index 02aecdad55f1..90a1b9a17e3e 100644 --- a/stand/kboot/Makefile.inc +++ b/stand/kboot/Makefile.inc @@ -1,7 +1,7 @@ # Bring in the mini-libc that we wrote KBOOTSRC=${BOOTSRC}/kboot -CFLAGS+=-I${KBOOTSRC}/include +CFLAGS+=-I${KBOOTSRC}/include -I${KBOOTSRC}/include/arch/${MACHINE_ARCH} LIBKBOOT=${BOOTOBJ}/kboot/libkboot/libkboot.a .include "../Makefile.inc" diff --git a/stand/kboot/kboot/arch/aarch64/stat_arch.h b/stand/kboot/include/arch/aarch64/stat_arch.h similarity index 100% rename from stand/kboot/kboot/arch/aarch64/stat_arch.h rename to stand/kboot/include/arch/aarch64/stat_arch.h diff --git a/stand/kboot/kboot/arch/aarch64/syscall_nr.h b/stand/kboot/include/arch/aarch64/syscall_nr.h similarity index 100% rename from stand/kboot/kboot/arch/aarch64/syscall_nr.h rename to stand/kboot/include/arch/aarch64/syscall_nr.h diff --git a/stand/kboot/kboot/arch/amd64/stat_arch.h b/stand/kboot/include/arch/amd64/stat_arch.h similarity index 100% rename from stand/kboot/kboot/arch/amd64/stat_arch.h rename to stand/kboot/include/arch/amd64/stat_arch.h diff --git a/stand/kboot/kboot/arch/amd64/syscall_nr.h b/stand/kboot/include/arch/amd64/syscall_nr.h similarity index 100% rename from stand/kboot/kboot/arch/amd64/syscall_nr.h rename to stand/kboot/include/arch/amd64/syscall_nr.h diff --git a/stand/kboot/kboot/arch/powerpc64/stat_arch.h b/stand/kboot/include/arch/powerpc64/stat_arch.h similarity index 100% rename from stand/kboot/kboot/arch/powerpc64/stat_arch.h rename to stand/kboot/include/arch/powerpc64/stat_arch.h diff --git a/stand/kboot/kboot/arch/powerpc64/syscall_nr.h b/stand/kboot/include/arch/powerpc64/syscall_nr.h similarity index 100% rename from stand/kboot/kboot/arch/powerpc64/syscall_nr.h rename to stand/kboot/include/arch/powerpc64/syscall_nr.h diff --git a/stand/kboot/kboot/host_syscall.h b/stand/kboot/include/host_syscall.h similarity index 100% rename from stand/kboot/kboot/host_syscall.h rename to stand/kboot/include/host_syscall.h diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index ae32d878a3f4..475f863b77bd 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -22,7 +22,6 @@ SRCS= \ bootinfo.c \ conf.c \ gfx_fb_stub.c \ - host_syscalls.c \ hostcons.c \ hostdisk.c \ hostfs.c \ diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile index 31f4827e64b9..33674da83661 100644 --- a/stand/kboot/libkboot/Makefile +++ b/stand/kboot/libkboot/Makefile @@ -7,7 +7,8 @@ WARNS?= 4 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} SRCS= crt1.c \ - host_syscall.S + host_syscall.S \ + host_syscalls.c .sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" diff --git a/stand/kboot/kboot/host_syscalls.c b/stand/kboot/libkboot/host_syscalls.c similarity index 100% rename from stand/kboot/kboot/host_syscalls.c rename to stand/kboot/libkboot/host_syscalls.c From nobody Sun Jan 28 20:05:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMqB6BH3z59CXF; Sun, 28 Jan 2024 20:05: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 4TNMqB43C5z3x7k; Sun, 28 Jan 2024 20:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=39ccBY3PBbYOt7UC4Hgs85RzLmGUnO/MUCBWRvsMAGA=; b=vF+MhcrcaUIspcSWRODabdXleSKcr2/Z0ix9eYzv5y0JWGQvoEXdVB+153zX7zueSPZ5F7 MVo9KDuzXQA4C9vvPNBjpMTKi8C/kpztjgOMZUHjmbgBN5D299jEcWd0v63EB1/mzLr9/C xKsZr48OpgVMHJKRwY/ezbIb7vP3/JCfnfiZXFlRNXELTRZogoxg2q686DvFG2I4NauCyh cOygacdBsX286XqBHKBCB1tPBb0bYBWRVYotOK5kh3OiZ2iKqpcugf47fgz2UTJGH5FV3f qtMCKD6UyqKSYltRTcxgDVWtHgTW3s4Pum+HX+LOLsWZoGxpDA7DLVy6XRhUQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=39ccBY3PBbYOt7UC4Hgs85RzLmGUnO/MUCBWRvsMAGA=; b=EcLTzP8tvgxnvJ/z2zI7rhJjzMHi75n3mhFqeFYc8dhJUxQwQ/kOg6QpK8lgymleY0wZ/J luykGiufUKjkbQE0xdy0su7I8/vq+EgGnLbz2Fwe3Izf3NfkqM7LjFnygiZYUdb42iMos+ J3W7bKOGc/RzTZRTAuMZ0wXVQZGSXWKxQuoQBQeP+NK2hH4111LLIuFnFSL5FBA8FNgL/h 6fNvuJzy08sg5QYuni4D+fZFyEzlDX0ZFr40vR+1KDmzT6/nBbJOHQ2ijlDL3zhqDbrTJT C8McD1Nzo1BsR6oPp0xSKTY+dR4HCOJyyQSfqJkAhwitkVSqJA90FhQoFVFuSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472310; a=rsa-sha256; cv=none; b=v1ZcgAd1C1JGVko9TMAq1LELE5vVFs4Vb8Fw/q5kMZeTK6uShtS1RL96o4aTbzxdht1bCw SEPNwbWjIN1RzKCPHaIW2Yk/8FJXPEr+YEmJAYUi0oI3DPu0X/TkqYhrRpYlVBd8yurpq7 kyg8wJHXHHBmue6fn8g0fZbliqoaGpgwqVp2J0+7aYoxFM/S9XrvS/07uynbct6D/FE02W 1hhucyR8xT8a/SD8XczmBQ9/SY/djeY5tvDzSSzeoL+YS9GGebbeyfP9QDA9yhyHu1bOQh rg0nLE67YLV4XZzb+k9aw/iQO071hGa/rzglbh8IzvdApRwyQ1DYR5Vq/Mm6AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMqB2sfmzM0V; Sun, 28 Jan 2024 20:05: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 40SK5ANv032684; Sun, 28 Jan 2024 20:05:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK5Afv032680; Sun, 28 Jan 2024 20:05:10 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:10 GMT Message-Id: <202401282005.40SK5Afv032680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 36ef238cb604 - main - kboot: Move termios to libkboot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36ef238cb604c827c696e975281f63d90641005f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=36ef238cb604c827c696e975281f63d90641005f commit 36ef238cb604c827c696e975281f63d90641005f Author: Warner Losh AuthorDate: 2024-01-28 19:28:30 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:31 +0000 kboot: Move termios to libkboot Sponsored by: Netflix --- stand/kboot/{kboot => include}/arch/aarch64/termios_arch.h | 0 stand/kboot/{kboot => include}/arch/amd64/termios_arch.h | 0 stand/kboot/{kboot => include}/arch/powerpc64/termios_arch.h | 0 stand/kboot/{kboot => include}/termios.h | 0 stand/kboot/{kboot => include}/termios_gen.h | 0 stand/kboot/kboot/Makefile | 1 - stand/kboot/libkboot/Makefile | 3 ++- stand/kboot/{kboot => libkboot}/termios.c | 0 8 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/kboot/kboot/arch/aarch64/termios_arch.h b/stand/kboot/include/arch/aarch64/termios_arch.h similarity index 100% rename from stand/kboot/kboot/arch/aarch64/termios_arch.h rename to stand/kboot/include/arch/aarch64/termios_arch.h diff --git a/stand/kboot/kboot/arch/amd64/termios_arch.h b/stand/kboot/include/arch/amd64/termios_arch.h similarity index 100% rename from stand/kboot/kboot/arch/amd64/termios_arch.h rename to stand/kboot/include/arch/amd64/termios_arch.h diff --git a/stand/kboot/kboot/arch/powerpc64/termios_arch.h b/stand/kboot/include/arch/powerpc64/termios_arch.h similarity index 100% rename from stand/kboot/kboot/arch/powerpc64/termios_arch.h rename to stand/kboot/include/arch/powerpc64/termios_arch.h diff --git a/stand/kboot/kboot/termios.h b/stand/kboot/include/termios.h similarity index 100% rename from stand/kboot/kboot/termios.h rename to stand/kboot/include/termios.h diff --git a/stand/kboot/kboot/termios_gen.h b/stand/kboot/include/termios_gen.h similarity index 100% rename from stand/kboot/kboot/termios_gen.h rename to stand/kboot/include/termios_gen.h diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index 475f863b77bd..055027b85eb2 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -29,7 +29,6 @@ SRCS= \ kbootfdt.c \ main.c \ seg.c \ - termios.c \ util.c \ vers.c diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile index 33674da83661..d9ce08cb0856 100644 --- a/stand/kboot/libkboot/Makefile +++ b/stand/kboot/libkboot/Makefile @@ -8,7 +8,8 @@ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} SRCS= crt1.c \ host_syscall.S \ - host_syscalls.c + host_syscalls.c \ + termios.c .sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" diff --git a/stand/kboot/kboot/termios.c b/stand/kboot/libkboot/termios.c similarity index 100% rename from stand/kboot/kboot/termios.c rename to stand/kboot/libkboot/termios.c From nobody Sun Jan 28 20:05:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMqC6bMGz59CPJ; Sun, 28 Jan 2024 20:05: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 4TNMqC4jGVz3x5h; Sun, 28 Jan 2024 20:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DFib+pYn/c0Y302ONXJfaQTtg33lIjLW9T6bGMbYLew=; b=pj3RDv0fcCfxi8/OZmnwjyKzTxx+TNszjRp6V+9/y+0e7FYBWhlc+c4sDDT0/hhWef5Z8E XexbRpm+OPG8yS49KEFE9lGrRrASYmvgB549rqdkFtFgC87E446Hyb/EbJ5Fc0DLN4hjkj 6lPyOYkphhVOnJhRn5RNWnrT9Y5fST4Z6gt9HuWrDrO7A/oPH01CJU5bijGWolS6GiE57L MOkdWKdMIcEC4rhGKnIIsIRoHHPl0siJzqnvJcGJOc9E3qbK4RPbItPu8gy5zJQOuNN5H8 iMkFmBMu3Pp7Loni7GJHU+QNcieJ19QVsyrXhhKr3EX9pOsl/YSA/P7ROtmByw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DFib+pYn/c0Y302ONXJfaQTtg33lIjLW9T6bGMbYLew=; b=mUdR9tKesQFA83Aric9ttqGVAwDlYRbsIBWLYznQTvZLRnoA0iwuk3QDqIrK0eu578F30A e/h3PnI8HryV1mt+MF9J4fH/JBZkyqeuVtXIOlSHAH2MCEXMptMH6NbRooAuO5ZxKRv2YL 0Ic9cVKsZN4m+mUAQVgohPJjNrkyc/HMPlocXgiI5yfA8db9w89RUur4EBumeL6uyB1IUO kvc7dyBeIJUZiw63SCIIIHQ/5SWtRQrlnBQElE/Ml3F7/q1G/dDeq/S6CdatE4tKfjwkmM 4qHrGiTr1G49p6iB0zTYlWkRe+vfPaRjZH7cQ+jU83jxLDPrgStypYeWRXRSAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472311; a=rsa-sha256; cv=none; b=WltIJitDFhz2QlPYo2bn2AhVcvJ/vucyb1y79ZZRzNt1zn2LMfdl+G+PNhTMK3ycj0Qea8 kTTihLXfvrPMdrSMaB1P2QnpiD3TfUhpU6QTzp9u3MBPLko033pPv6eeNQRb1TVpE/uRmL +sAhCquthk9zhqEmyvYOPuJrLtvUGFadOZQY9dj2s5AWjO302f/TRV9LqpWJEpmnBRTusP GtUsjt0NAFR2QAgmgo8SO6BE0IKYRxXpSmIF3LeqKc5jayHvdF5PDW7getY1tojjcndfG0 T4UehFva+bCQ62JJBa+OB66FK9YD/T0esCobFiOGHOYMLPJdBO/uqbbCKH+n8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMqC3ptnzLcw; Sun, 28 Jan 2024 20:05: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 40SK5Bxi032724; Sun, 28 Jan 2024 20:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK5Bi0032721; Sun, 28 Jan 2024 20:05:11 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:11 GMT Message-Id: <202401282005.40SK5Bi0032721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2b7918f13c6f - main - kboot: Assert copyright here List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b7918f13c6fce378a75f8247b5dd203bf4a3c5d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2b7918f13c6fce378a75f8247b5dd203bf4a3c5d commit 2b7918f13c6fce378a75f8247b5dd203bf4a3c5d Author: Warner Losh AuthorDate: 2024-01-28 19:17:44 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:32 +0000 kboot: Assert copyright here According to git blame I've 95%+ rewritten this file. Update copyright to reflect that, but give nod to Nathan for the original I started with. Sponsored by: Netflix --- stand/kboot/include/host_syscall.h | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/stand/kboot/include/host_syscall.h b/stand/kboot/include/host_syscall.h index fc44419201f6..fd3b7a0f362b 100644 --- a/stand/kboot/include/host_syscall.h +++ b/stand/kboot/include/host_syscall.h @@ -1,26 +1,9 @@ -/*- - * Copyright (C) 2014 Nathan Whitehorn - * All rights reserved. +/* + * Copyright (c) 2022, Netflix, Inc. * - * 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. + * SPDX-License-Identifier: BSD-2-Clause * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL TOOLS GMBH 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. + * Rewritten from the original host_syscall.h Copyright (C) 2014 Nathan Whitehorn */ #ifndef _HOST_SYSCALL_H From nobody Sun Jan 28 20:05:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMqF0vdSz59CgC; Sun, 28 Jan 2024 20:05: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 4TNMqD66vdz3xP4; Sun, 28 Jan 2024 20:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IouZ2/4YcdFE1tvS/MBI8KKeYvdwYlLGQ2uV8j574OQ=; b=HfhiSuEE21HHf7pGopywbSl8ZwOP27q5fw+Iq2osdkqrRufXzfoix32VXc0qK7IW+H+lJx zhOci+QnmUsbmcVqkWa4GQ3+g+jWcYIpyzrPRlpSd7A/7k0nSYnroy+v59reJQCn9k5+Vg UOCBe7mz6jxz2kOq8OU8h+l4yHK31aO+JZhe/7NSo6GXCTOxg+BxtslPsWMWeDhaZpO5XC Zn6NhoysnPSto0msSZRKegiO6163JVmNSPxyfQSxYfVFabg2i7qGciS7VPPKY+bv24dBgv EoxquRtC96WyVAExJ9wdyrcjnqQyVzl0r0NgRdc5zwZKrb7NUVIEmx3Kg4Bcjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IouZ2/4YcdFE1tvS/MBI8KKeYvdwYlLGQ2uV8j574OQ=; b=taqNxULTkNL0U0AW55o/kzRwrdhzubasue2bLAjuUvRbeLTTW/g6FHA1DJjyVp1lFhOPn/ x26e/f/yw5rmwzwX9+T48gpKSbw5HVeTbBmMjIocxGi2YEHIvFkLPNpj32lMMe/Yiw8wNU BGh/yCp8ab2cAJ7rELn1fgBxUkyuT3Zob6O7WWvDVlk2tgzv2vvucAOLiqIYH5m2ZjfloI keVeUoOfB0cb8P6FQqtAUuTC5i0C6qdAzhKXMjsm4pfGa7Mg3aDMNUkDTOG7h7+HlYxXpv gbahy5BP9GDJSSDclP6DvNbNcx1hvZmdKM0GnNKmaqx//UA0NnTtwW/QPzdVxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472312; a=rsa-sha256; cv=none; b=DF9XI5581RwKVdCImxeP4h9Oy+VJjzQccocfzVC5bDBiS5yw104Y7K2Wx0qBlbrch+rdlo A0P2NYhjqbHGnwnc/Xs1aTpMtxfWQnujix3XVL+FCHohzDob6O45z/VVk5LLvwNtFmk9Z5 welbGXfeB60jPdNGUskajlli6ODtfJ2pi442Qhdso78FqW8IqXrE88YeDBpzpxNDA+hFIG kn8MDVl72n4fWGnHjsFddi3TS9Y01+crK0Q03gewMLsHn9cSEbBzG09KAs9/FV8brP3dg0 7WqRiLVUR3nQoD7XjvXnwqzRIvbb/nhiy7FfFsi27zqSaohy9/y0Kzo7Wq/jjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMqD4x5jzLTH; Sun, 28 Jan 2024 20:05: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 40SK5CqY032769; Sun, 28 Jan 2024 20:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK5CLT032766; Sun, 28 Jan 2024 20:05:12 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:12 GMT Message-Id: <202401282005.40SK5CLT032766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8f7327dceecc - main - kboot: update copyright on these files. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f7327dceecc225029b17378e4a26ae0b73a0a49 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7327dceecc225029b17378e4a26ae0b73a0a49 commit 8f7327dceecc225029b17378e4a26ae0b73a0a49 Author: Warner Losh AuthorDate: 2024-01-28 19:19:32 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:32 +0000 kboot: update copyright on these files. host_syscalls.c: I've written, so put Netflix copyright on. It's possible in the confusion that Nathan wrote the host_gettimeofday implementation. syscall_nr: These files likely can't enjoy copyright protection since they are just facts (the per-arch Linux system calls), so add a note they are in the public domain. Sponsored by: Netflix --- stand/kboot/include/arch/aarch64/syscall_nr.h | 4 ++++ stand/kboot/include/arch/amd64/syscall_nr.h | 4 ++++ stand/kboot/include/arch/powerpc64/syscall_nr.h | 4 ++++ stand/kboot/libkboot/host_syscalls.c | 6 ++++++ 4 files changed, 18 insertions(+) diff --git a/stand/kboot/include/arch/aarch64/syscall_nr.h b/stand/kboot/include/arch/aarch64/syscall_nr.h index 83069dd8dc76..5c776db81d03 100644 --- a/stand/kboot/include/arch/aarch64/syscall_nr.h +++ b/stand/kboot/include/arch/aarch64/syscall_nr.h @@ -1,3 +1,7 @@ +/* + * This file is in the public domain. It only recounts facts in the only way + * possible. + */ #define SYS_close 57 #define SYS_dup 23 #define SYS_exit 93 diff --git a/stand/kboot/include/arch/amd64/syscall_nr.h b/stand/kboot/include/arch/amd64/syscall_nr.h index 2cf26d7ca4dc..705b39c62f44 100644 --- a/stand/kboot/include/arch/amd64/syscall_nr.h +++ b/stand/kboot/include/arch/amd64/syscall_nr.h @@ -1,3 +1,7 @@ +/* + * This file is in the public domain. It only recounts facts in the only way + * possible. + */ #define SYS_close 3 #define SYS_dup 32 #define SYS_exit 60 diff --git a/stand/kboot/include/arch/powerpc64/syscall_nr.h b/stand/kboot/include/arch/powerpc64/syscall_nr.h index 735e79a09158..50946a4f058c 100644 --- a/stand/kboot/include/arch/powerpc64/syscall_nr.h +++ b/stand/kboot/include/arch/powerpc64/syscall_nr.h @@ -1,3 +1,7 @@ +/* + * This file is in the public domain. It only recounts facts in the only way + * possible. + */ #define SYS_close 6 #define SYS_dup 41 #define SYS_exit 1 diff --git a/stand/kboot/libkboot/host_syscalls.c b/stand/kboot/libkboot/host_syscalls.c index 092ddfd133fd..551ff6b777d6 100644 --- a/stand/kboot/libkboot/host_syscalls.c +++ b/stand/kboot/libkboot/host_syscalls.c @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2022-2024, Netflix, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + #include "host_syscall.h" #include "syscall_nr.h" #include From nobody Sun Jan 28 20:23:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNNDX0vtbz59Dnm; Sun, 28 Jan 2024 20:23: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 4TNNDX0NN3z42SJ; Sun, 28 Jan 2024 20:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706473420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wXRek7SbU+tW3jofN21ZHgpouM761ey2Oe9lQtcVmDg=; b=JiMUYs/s0odgrmSkW3e4/AEcmP0i4lNUS88rKQcBv9yr/jYm25xx7ibm2/Kvvu125vwIV2 NAW23w7hhesZRp/iEBfkX7EOu8nrv5SSpGcoK6rgDBKXcqIciTsZlAHvCE4aHoclM+FqZj 64glbcKKyVBLZSI64jti96XxiPljai4fEXtYmyUYM3O+fjq51g627eYq0/kxp/PvVQK9EB Y96slAV+joNZY/dhMRYnOeq+xzlpMQcziot+BXvM6WouP7SQPN4VDciaVx2S+g4GoBDli9 ScmBvlhSoXc0oplB63F74JL8EMmT0qCvNIetg0b5/jUu4XlQMSDIOKJE2gUajA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706473420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wXRek7SbU+tW3jofN21ZHgpouM761ey2Oe9lQtcVmDg=; b=Vek1wyOF+ReCCJrNIubaLogkDLcwncc2QHbgYg7xQIlNBWKlmKUTkzAC6wtfDmXKYWRLzF hJvxeVZ25gvltnjl4LsBWiC/FD9JCc5Hx8Crf3ymAsuxIj/nHiIL2J+YE3gBIi1w51pfng P+QMPaey2QMTHxudg+YogVy9YvB8cPGA2239zqE5R0ttRJp4xpxhkbL+Ru4+51S0svcKkK /agl+KlB+e4byMpar+FdZxuIXWPN9J0pidXhkvOhaIl8sL2TIiH5+tgT21L+eeYHgW6bt1 cArwMpuG9uJIKX51Xmclf3hvok0R5D4bjBLrFQqN66bpTXDrQ2MY7J9jY3mIeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706473420; a=rsa-sha256; cv=none; b=f/lS6MLLoS8tyW0aCAnsKoE318bwCsEXEs2BdC0zloahvSK9BZVrgImChnioXUGvxvLzay O+SRNBDwcY+ZYjM6NpLtyhp3Jq/6zCnrPYDybHu4eiwHZFMAmM91aO1FohWwU42koNSczO KYHr1yE33IbOyudj7ocOpMG9MERTFwBvATEYooK3JMozHGVmtJIrkBYmBvpyXLDS+4abBn rP5B0JOeYTj3KdykudLmWN8fF61q6umd/6M7aYq3X/MwETI1uoMiK5C+mdwqe74+7demnE cDHv4sDDowcdWLRyQkMAc5DWWJgZKPJOMwmMOy72BR71X4qVIYZyK8JmNUPz9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNNDW6XsZzMR9; Sun, 28 Jan 2024 20:23: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 40SKNdqj065394; Sun, 28 Jan 2024 20:23:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SKNdnw065391; Sun, 28 Jan 2024 20:23:39 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:23:39 GMT Message-Id: <202401282023.40SKNdnw065391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: fb87726303b6 - main - snd_hdspe(4): Per device sysctl for period. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb87726303b6e620a06fec1d3b2988d428e33ac2 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=fb87726303b6e620a06fec1d3b2988d428e33ac2 commit fb87726303b6e620a06fec1d3b2988d428e33ac2 Author: Florian Walpen AuthorDate: 2024-01-28 20:18:20 +0000 Commit: Ruslan Bukin CommitDate: 2024-01-28 20:20:26 +0000 snd_hdspe(4): Per device sysctl for period. Let the user choose a period (interrupt cadence in samples), in the official RME drivers this setting is available as "Buffer Size". Override the period propagated through blocksize by pcm channel latency settings (see sound(4)), since these are unreliable and differ between playback and recording channels. Differential Revision: https://reviews.freebsd.org/D43527 --- share/man/man4/snd_hdspe.4 | 7 ++++++- sys/dev/sound/pci/hdspe-pcm.c | 3 +++ sys/dev/sound/pci/hdspe.c | 38 ++++++++++++++++++++++++++++++++++++++ sys/dev/sound/pci/hdspe.h | 1 + 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/share/man/man4/snd_hdspe.4 b/share/man/man4/snd_hdspe.4 index 6023cd3d2ccd..d4ddc70f4070 100644 --- a/share/man/man4/snd_hdspe.4 +++ b/share/man/man4/snd_hdspe.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 8, 2024 +.Dd January 19, 2024 .Dt SND_HDSPE 4 .Os .Sh NAME @@ -76,6 +76,11 @@ To adjust the following sysctl identifiers for a specific sound card, insert the respective device number in place of .Ql 0 . .Bl -tag -width indent +.It Va dev.hdspe.0.period +The number of samples processed per interrupt, from 32, 64, 128, up to 4096. +Setting a lower value here results in less latency, but increases system load +due to frequent interrupt processing. +Extreme values may cause audio gaps and glitches. .It Va dev.hdspe.0.clock_list Lists possible clock sources to sync with, depending on the hardware model. This includes internal and external master clocks as well as incoming digital diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index db39b867879f..f6c7c84e026e 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -891,6 +891,9 @@ hdspechan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) blocksize /= 4 /* samples */; + if (sc->force_period > 0) + blocksize = sc->force_period; + /* First look for equal latency. */ for (i = 0; latency_map[i].period != 0; i++) { if (latency_map[i].period == blocksize) diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index e0197d1e981a..b1ca67bdc313 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -228,6 +228,31 @@ hdspe_map_dmabuf(struct sc_info *sc) } } +static int +hdspe_sysctl_period(SYSCTL_HANDLER_ARGS) +{ + struct sc_info *sc = oidp->oid_arg1; + int error; + unsigned int period; + + period = sc->force_period; + + /* Process sysctl (unsigned) integer request. */ + error = sysctl_handle_int(oidp, &period, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + + /* Period is from 2^5 to 2^14, 0 falls back to pcm latency settings. */ + sc->force_period = 0; + if (period > 0) { + sc->force_period = 32; + while (sc->force_period < period && sc->force_period < 4096) + sc->force_period <<= 1; + } + + return (0); +} + static int hdspe_sysctl_clock_preference(SYSCTL_HANDLER_ARGS) { @@ -419,6 +444,13 @@ hdspe_init(struct sc_info *sc) /* Set latency. */ sc->period = 32; + /* + * The pcm channel latency settings propagate unreliable blocksizes, + * different for recording and playback, and skewed due to rounding + * and total buffer size limits. + * Force period to a consistent default until these issues are fixed. + */ + sc->force_period = 256; sc->ctrl_register = hdspe_encode_latency(7); /* Set rate. */ @@ -524,6 +556,12 @@ hdspe_attach(device_t dev) sc, 0, hdspe_sysctl_clock_list, "A", "List of supported clock sources"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "period", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, + sc, 0, hdspe_sysctl_period, "A", + "Force period of samples per interrupt (32, 64, ... 4096)"); + return (bus_generic_attach(dev)); } diff --git a/sys/dev/sound/pci/hdspe.h b/sys/dev/sound/pci/hdspe.h index d5d8dd46e580..81116e0cd437 100644 --- a/sys/dev/sound/pci/hdspe.h +++ b/sys/dev/sound/pci/hdspe.h @@ -227,6 +227,7 @@ struct sc_info { bus_dmamap_t rmap; uint32_t period; uint32_t speed; + uint32_t force_period; }; #define hdspe_read_1(sc, regno) \ From nobody Sun Jan 28 20:23:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNNDz57p0z59F0t for ; Sun, 28 Jan 2024 20:24:03 +0000 (UTC) (envelope-from qgmcrae@yahoo.com) Received: from sonic316-21.consmr.mail.ne1.yahoo.com (sonic316-21.consmr.mail.ne1.yahoo.com [66.163.187.147]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNNDy4F0Nz43fx for ; Sun, 28 Jan 2024 20:24:02 +0000 (UTC) (envelope-from qgmcrae@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=CBWZHF3c; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of qgmcrae@yahoo.com designates 66.163.187.147 as permitted sender) smtp.mailfrom=qgmcrae@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1706473440; bh=oQVrm4JM1X0wDCMXvmOHv4D9tQl39pOLC72bTquZ9bE=; h=From:Date:Subject:To:References:From:Subject:Reply-To; b=CBWZHF3cFv/O7EvWoRNlC7jhp+zO7NN808wALROJaFxbXr7EjIPBnd+tCENPF3zeeuzmMbTJhYdtDJF+Zfdmlh0w/Nh/oGfYpOB2kwR//FLpB1MdSmfe16Kk3xRbSfBDAPc443KeIwD3ruJTM+2fAc4tDmV396pAeTqmWpL0SJG2p3TQC3Nh8eQegXtjYkzZC2wyBQOZRfuwJJiaiHdaf0f0Vaf+lnCxuXDqgwoA9SV7rbScTzNepVlt92Yu4W3V4B2U4DaeZbH8ckcavk0gKB6J6b/e1w1byKLBtVdYLHleqxvQOIgTu82rV9KfQlt1ty7UZQa9cq4tZR5+m5PViw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1706473440; bh=3Uks/MjtqHr1p0vueNMydbHKo1B2jCR7q0E3Xb9eLIb=; h=X-Sonic-MF:From:Date:Subject:To:From:Subject; b=UOGd6Ar48AIDBgDNCbvj4cC+UFMDHEY9XlzKl6IovjrGza26BI7+DH7DXf2wdVA+20gITJjtmETDMJ3End+jqkCEY1B2Erw1nJu56GurhTuN5pUJWNkMY+PZTrKhjNGtDiTUg9NRDGEVgGVIzxPYMtkPRtuuJsLK4y4H4rI4z1ESGFTQJMWsAXEZxJtr6PARwAl8QZhmEgg/EPAXqXoUo7nTGwNB2xGvGb4Ze1MNcDOamHIG5ydqysqIuM2+j6UWw1q3V60Gf1QKW+wklwUXSkNHzPgfyF0m3VFebeakFu0Bkf5IfSyoyUh2WT3igId6HMyG3a6163vLNlVP7zd/bA== X-YMail-OSG: g60aC_4VM1lE99zkqg4bet_muLbrpybQatdYqB_XAwOP16vJfYA4QiwtzBqhtOi auqE0EMwy6FXbm65icW6ELGZNAkrR0nDDhzzl5dW_1oUtcN7aOFM7IzPhwviS_h1AyYfvP5k7p6X RL5zt4InNVKhI37emSKyqMMWPv8hDRPcLnB3LsKMolg35i5.HnXKhjViRpcY7D.mfPRFO0wv05Qg LbUMNU3FtjyI1EN3n1ectnkfqnfB36PV8o.MWGvQa4.ZAD0rCACNmEfrCFQQg66QRC3fsTWtXN90 DswtqLAEi1ZSCgLPLwTQmBHIOyExdTi7SqXGaV6IPlkgyi7AEZRuwK.kgx1F..KZA1wNLK7F_mQz NZq7WlEM5FEBxZqGfWCJ46IoD.gkBI6DQEoeEatHuGgiOKYYwukNDzzJpKvWK9TyPvOIXf2Rh8Qi 026_OW1Aczyr7fzsX5Vv_EIkx5wI1a7kI0W2fPUkiTabH1_32BMrvxVqCrF1vsDZ9JOl8mkXxsjY lnZD5vRBWV4KbPypWIkjSOj0vrNhwVMiKUr3lqwS5LTI7Gd7bKs_cQa9ywmJPZg4NvNZY7KKGLwc vDno9Gep2KAZa6O.q8weXqGYjh951UhjdEVWEn6a5Pm91z0zAKhmX7C6MPUr4Ss6w2kMa6HL8V8a AYWNAHibFbSE5rAIoUmgxowziCzPKE0SR7.5LSz47zMS64XVqIzx8D12cN9gOVAgvLB0_nFVoAks bWMAzEMBsjyzrpGjKi1rP1ikuYBFMuolSt4MVHEQqhQOFHI6B2s5EyzV0UYN_u5Gr_SBzrB8waMg YdDTkBXN_pIp8_r0bgrOWqr.XxbqJ8fg2EEU8kw.eV63PRF8ugV8oWFPg_cFPFUdIhljqrGcdNrL GLxKIXPqywxQhBkmBLPWZnHl9TaCimUgAI8uK7DzEzGI3NuxE_aM7msddExXyYtrkDwx5.kpRu91 shwF.O2Qmao7z7cAcZnArxAsqWFE9CO6S7c1n8LPBIXIpae3iOjFdq7Mx_Z26T2p8CGPqLzPV5NR Ib7dfnJkpUyS8NYERreEqBgXXjyQKVOUFiChi8j_jIwbh5bckXB1MPRUTeukCwIMQpyZz8k.Nvm4 e.sS87NdyGAvcTpXuA59xfUAeeGDlvwU5ci3GMI10WgC3VwrSiusFmQMhdyVUBOcKGHNrPImVVx1 N_UW7kjlb1479yLcHNIV3WxCDzLfF6aIaMaNZDQdiSmcM0p8CblINqhlqUZUI8uXggVGiC9supME .YEsE4Jqabkw4qxq9nQ7pkZTnUXkTvojmFtzMaP4hSONtYSPPnHUkPn7wmGeTYeCjEG3FWbp5avW Ew2rHHjoaxSTC5w_CiUw8ZlgNIkHfsRYqfyf980E_i5en2uUpF6pjyYNlPUcKg3k1sCbWGc1yO5l NljGgYpfInqshn0jDNZM36zvdeOpBwije3JHMNd3rXNj_v6cZMAkl9K47HvqdGxaS5aKm7EpAx5b mk0AeOM45yF9gNMTiygg4REQfMvwCV6o1t_YyzVrawWi2EPpOX8GoFumhHohoSx9.PSblkDOVWjA QqlxWUdF1WvA9DM3Zv8dI1eaRGFx.cnnHg797dxJr6tBD_wXGetqeVyDAUtqOKiV5cPlEl2oLx56 hvYUUvRj482tSmJ9ebzRZbb1p3mereb51amWChlURh7e.yMg87FBjPymJDua5a6UA1Nqy1YdJzci pIBppaw6cGU86n6gt9.rZOpSQLFCWgxjqXJOQxrqjFmVmZow2Rv9zdErZ6NRWJQnl8GWKkaNb7fP 7sQVKTDjqjNYKsh2KbFtK1v4mo1Dki7q0hOLxZT4QduirduCtFEGZBTBJMOEySYboZbziMFgGI8I e6h7RqPzYAz9zuu4TjtQlcckLTOJZiw6hGeBbFrwjtEEdBdU_N.RBAVERPiiYgNo28NZOt.P91sK qYuYfp3e10QpHp7q9.KU6bJS8TpZ6_L7KNT5KxSEtiC1R..EK43HpioBE855HB9k6lIlYDKh0Qyn 8yQEs1gjul3TlRQsWOVokxtbAidVrEfNu4Da60vgCKKF9K9YmRq_MpUeOcZoWJHVc_KtHsqa6k6r wyWi4jV9OPk6uUek6b0_18uPe7plpklx_wTfxwQQveKgSyq.PvpcaIoo4ErGGtThoXVAMhK3oZix 3NzA_TcJjVEC4igUlYErAVfNuBKrWaSQp0jEOJtH1gnwsXWJVlXGqIPP9MCd2z_O8i9c_AmQhXgV erC.1bMUy9wJ.S.iRjusWhg7zOutc X-Sonic-MF: X-Sonic-ID: 93dc2747-240d-465d-83ec-df97e624751e Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.ne1.yahoo.com with HTTP; Sun, 28 Jan 2024 20:24:00 +0000 Received: by hermes--production-bf1-7d6dbd57c9-92bzx (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 29984fd41369367edbe3e35e62da3b68; Sun, 28 Jan 2024 20:23:57 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit From: Quincy Mcrae List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (1.0) Date: Sun, 28 Jan 2024 16:23:46 -0400 Subject: Unsubscribe Message-Id: <81A9CC79-120D-43BB-8F06-BC1E8972B01A@yahoo.com> To: dev-commits-src-all@freebsd.org X-Mailer: iPhone Mail (21D50) References: <81A9CC79-120D-43BB-8F06-BC1E8972B01A.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.49 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.991]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; SUBJECT_ENDS_SPACES(0.50)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; FREEMAIL_FROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:36646, ipnet:66.163.184.0/21, country:US]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; APPLE_IOS_MAILER_COMMON(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[66.163.187.147:from]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; SINGLE_SHORT_PART(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[66.163.187.147:from] X-Rspamd-Queue-Id: 4TNNDy4F0Nz43fx Sent from my iPhone From nobody Sun Jan 28 23:54:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNSvj48gWz57Zdn; Sun, 28 Jan 2024 23:54: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 4TNSvj3h7mz4jjK; Sun, 28 Jan 2024 23:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706486065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0VMwb8pLXF/rQ28bYOW5j+ORPl65lyAcoCAjfDs6SPA=; b=epLjZKXVbs8nhcE0jm7tTcHWwSj3D3jDFy4RSOgd2Bx+V0/HUKWwIL2dGCMuLC9WdDQ4sw J33oIsj6L5//0Y5OazUZ6HxdTmQKs7LUYLj0zv1djg6gW7EN1EhUX3LiLkLTC1Tj4vkvbG ML9p7WBp/WpZnFlnAO63y5lv8PfBFTViMuRjOxZ/TVMEawpA4+ye9TD9Aa5OomK+DJvQCp HwG056dVgq2LpKV7uAng/4vwvhqyr2WlQt2/ot9MiydYigo+mnR4/+XgKDVUbaAD7ClT2Z FrQvsEMkwiMswxtPDz4BA90NK2i3FMYtZ1x4H/4vjfRJcwMIXt2Ecl7QXwaaOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706486065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0VMwb8pLXF/rQ28bYOW5j+ORPl65lyAcoCAjfDs6SPA=; b=BYOmJONqrqS1Plegbn4ep2McBRkwwiU+sShDIqN8rrbUdNLPLzovxI2OzwlppcYL3lY+IG CcOVkMC3E6jHMQCx5bWXlz0qFzyfspMrKHVVX/M3FmINKppDg/i4k9jLYqJnluZbCIY6NF Amio50oz57W3xs9xi11G9soOnDRItBgozxjNWOX9XjKSppPE67m3rD6h5sX8VfB+mrz8FV 6ncT0FP/S+sCONLmT7g8Mk7GOE/VWmc88kOcyk86oC+rq5gXSlIBXUxXNg2+5r39VtICay 5K2X1cCdwknxtyTZyyduh+jewwN9wj6b2EMRPk9iFuHUMch+LwN9T2kuknqJdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706486065; a=rsa-sha256; cv=none; b=Uo6fQmhvBLuobGEp0/Fo6esCmusvnKuL2AUTAVbmLkKcKgPlmDIaR47V4pe/D/1WXU9YGp WwfaDCblQQCtRZg2SIId7v5hqJoQYHZwUvTyA8uiYk0FcKdv1XnCDgjFgpb5oiX5QaB+B7 UmLds2oZ2A/HS015Uzr7vc9vOCxpxePPE8VEJzN16EpwmmIAeobIzMHep5sr6epJyObHs+ oFac/RqzFWf57/SHii+uD6uSPW5G+S94V2xs4psZBwA7rl9qd8u5/BypjVGdnniSk30vHZ rFZbvM51pz9LPGUVMtWRlQb4bAGDAWQrFEanme/otHZhvFlNMzTmUknqhTFvMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNSvj2kQSzSBM; Sun, 28 Jan 2024 23:54: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 40SNsPBv020250; Sun, 28 Jan 2024 23:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SNsPjF020247; Sun, 28 Jan 2024 23:54:25 GMT (envelope-from git) Date: Sun, 28 Jan 2024 23:54:25 GMT Message-Id: <202401282354.40SNsPjF020247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: dca696965fda - stable/14 - bhyve nvme: Add NQN value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dca696965fdaee80f91d44cc210bae380ce6b56b Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=dca696965fdaee80f91d44cc210bae380ce6b56b commit dca696965fdaee80f91d44cc210bae380ce6b56b Author: Chuck Tuffli AuthorDate: 2023-10-12 22:04:17 +0000 Commit: Chuck Tuffli CommitDate: 2024-01-29 05:19:00 +0000 bhyve nvme: Add NQN value Add a NVMe Qualified Name (NQN) to the Controller Data structure using the "first format" (i.e., "... used by any organization that owns a domain name" Section 7.9 NVM-Express 1.4c 2021.06.28 Ratified). This avoids a Linux kernel warning about a missing or invalid NQN. (cherry picked from commit 32557d16e2c3c24c04eccfafd895e1514dc65b35) --- usr.sbin/bhyve/pci_nvme.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index d1b15d6f3a3c..2fd49a84c768 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -514,6 +514,7 @@ static void pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) { struct nvme_controller_data *cd = &sc->ctrldata; + int ret; cd->vid = 0xFB5D; cd->ssvid = 0x0000; @@ -583,6 +584,13 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; + + ret = snprintf(cd->subnqn, sizeof(cd->subnqn), + "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u", + get_config_value("name"), sc->nsc_pi->pi_bus, + sc->nsc_pi->pi_slot, sc->nsc_pi->pi_func); + if ((ret < 0) || ((unsigned)ret > sizeof(cd->subnqn))) + EPRINTLN("%s: error setting subnqn (%d)", __func__, ret); } static void @@ -3309,7 +3317,6 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl) pci_nvme_aen_init(sc); pci_nvme_reset(sc); - done: return (error); }